Pārlūkot izejas kodu

git-imerge: add "abort" example (#1339)

Waldir Pimenta 8 gadi atpakaļ
vecāks
revīzija
df46736db7
1 mainītis faili ar 5 papildinājumiem un 1 dzēšanām
  1. 5 1
      pages/common/git-imerge.md

+ 5 - 1
pages/common/git-imerge.md

@@ -19,6 +19,10 @@
 
 `git imerge continue --no-edit`
 
-- Wrap up the imerge operation, after all conflicts are resolved:
+- Wrap up imerge operation, after all conflicts are resolved:
 
 `git imerge finish`
+
+- Abort imerge operation, and return to the previous branch:
+
+`git-imerge remove && git checkout {{previous_branch}}`