mirror of https://github.com/CrimsonTome/tldr.git
git-merge: add --abort
parent
ade42815d7
commit
bade4c7c03
|
@ -13,3 +13,7 @@
|
||||||
- Merge a branch and create a merge commit:
|
- Merge a branch and create a merge commit:
|
||||||
|
|
||||||
`git merge --no-ff {{branch_name}}`
|
`git merge --no-ff {{branch_name}}`
|
||||||
|
|
||||||
|
- Abort merge:
|
||||||
|
|
||||||
|
`git merge --abort`
|
||||||
|
|
Loading…
Reference in New Issue