From 4bd7a1da174d940628c622cdbc5191b8af3e06ab Mon Sep 17 00:00:00 2001
From: Dillon Flamand <dflamand@users.noreply.github.com>
Date: Mon, 2 Apr 2018 16:59:41 -0700
Subject: [PATCH] git-merge: add --no-ff example

Include an example and brief description of the --no-ff option
---
 pages/common/git-merge.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/common/git-merge.md b/pages/common/git-merge.md
index 7dbf79537..abfae47a5 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}}`