giconfig: Add an unmerge command to reset back to master.

eremite · Dec 9, 2016 · 62debb0 · 62debb0
1 parent b87b8f0
commit 62debb0
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/gitconfig b/gitconfig
@@ -41,6 +41,7 @@
 	s = status --short
 	sh = show
 	uncommit = reset --soft HEAD^
+	unmerge = reset --hard origin/master
 	z = stash
 	zp = stash pop
 [init]