DawnMagnet/tldr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Waldir Pimenta
2017-04-21 10:45:54 +01:00
committed by GitHub
parent 9475cd3589
commit df46736db7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pages/common/git-imerge.md
View File

@@ -19,6 +19,10 @@
`git imerge continue --no-edit` `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` `git imerge finish`
- Abort imerge operation, and return to the previous branch:
`git-imerge remove && git checkout {{previous_branch}}`