abort merge?
authorpatrick nsukami <ndkpatt@gmail.com>
Sun, 22 Feb 2015 21:32:50 +0000 (21:32 +0000)
committerpatrick nsukami <ndkpatt@gmail.com>
Sun, 22 Feb 2015 21:32:50 +0000 (21:32 +0000)
.gitconfig

index 41575c5..dd56dbc 100644 (file)
@@ -23,7 +23,7 @@
         undo-commit = reset --soft HEAD^
         undo-add = reset HEAD
         undo-modif = checkout
-
+        abort-merge = reset --hard HEAD
         assume-unch = update-index --assume-unchanged
         unassume-unch = update-index --no-assume-unchanged
         list-assumed-unch = !git ls-files -v | grep "^[[:lower:]]"