diff --git a/pages/common/git-merge.md b/pages/common/git-merge.md index 7dbf795371..abfae47a5d 100644 --- a/pages/common/git-merge.md +++ b/pages/common/git-merge.md @@ -9,3 +9,7 @@ - Edit the merge message: `git merge -e {{branch_name}}` + +- Merge a branch and create a merge commit: + +`git merge --no-ff {{branch_name}}`