diff --git a/pages/common/git-merge.md b/pages/common/git-merge.md index fc0356d77..59f50ed40 100644 --- a/pages/common/git-merge.md +++ b/pages/common/git-merge.md @@ -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}}`