git-merge: add --abort

2018-07-18 23:05:38 +02:00
parent ade42815d7
commit bade4c7c03
1 changed files with 4 additions and 0 deletions
--- a/pages/common/git-merge.md
+++ b/pages/common/git-merge.md
@@ -13,3 +13,7 @@
 - Merge a branch and create a merge commit:

 `git merge --no-ff {{branch_name}}`
+
+- Abort merge:
+
+`git merge --abort`