mirror of
https://github.com/tldr-pages/tldr.git
synced 2025-04-22 14:42:07 +02:00
3d5d15621b
* 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>
24 lines
494 B
Markdown
24 lines
494 B
Markdown
# git merge
|
|
|
|
> Merge branches.
|
|
> More information: <https://git-scm.com/docs/git-merge>.
|
|
|
|
- Merge a branch into your current branch:
|
|
|
|
`git merge {{branch_name}}`
|
|
|
|
- Edit the merge message:
|
|
|
|
`git merge --edit {{branch_name}}`
|
|
|
|
- Merge a branch and create a merge commit:
|
|
|
|
`git merge --no-ff {{branch_name}}`
|
|
|
|
- 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}}`
|