mirror of https://github.com/CrimsonTome/tldr.git
git-merge: update page (#10232)
* git-merge: Added merge with strategy options Co-authored-by: Lena <126529524+acuteenvy@users.noreply.github.com> * git-merge: -e to --edit --------- Co-authored-by: Lena <126529524+acuteenvy@users.noreply.github.com> Co-authored-by: K.B.Dharun Krishna <kbdharunkrishna@gmail.com>pull/23/head
parent
d9c66f9c66
commit
3d5d15621b
|
@ -9,7 +9,7 @@
|
|||
|
||||
- Edit the merge message:
|
||||
|
||||
`git merge -e {{branch_name}}`
|
||||
`git merge --edit {{branch_name}}`
|
||||
|
||||
- Merge a branch and create a merge commit:
|
||||
|
||||
|
@ -18,3 +18,7 @@
|
|||
- Abort a merge in case of conflicts:
|
||||
|
||||
`git merge --abort`
|
||||
|
||||
- Merge using a specific strategy:
|
||||
|
||||
`git merge --strategy {{strategy}} --strategy-option {{strategy_option}} {{branch_name}}`
|
||||
|
|
Loading…
Reference in New Issue