git-merge: add --no-ff example

Include an example and brief description of the --no-ff option
2018-04-02 16:59:41 -07:00 · 2018-04-02 16:59:41 -07:00 · 4bd7a1da17
parent 4aa6a324be
commit 4bd7a1da17
1 changed files with 4 additions and 0 deletions
--- 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}}`