mirror of
https://github.com/tldr-pages/tldr.git
synced 2024-09-21 00:38:17 +03:00
git-imerge: add "abort" example (#1339)
This commit is contained in:
parent
9475cd3589
commit
df46736db7
@ -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}}`
|
||||
|
Loading…
Reference in New Issue
Block a user