ctome
/
tldr
mirror of https://github.com/CrimsonTome/tldr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Gonzalo Matheu 2023-05-19 01:03:57 -03:00 committed by GitHub
parent d9c66f9c66
commit 3d5d15621b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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}}`