bash: add the merge option --ff-only

bjorng · gitster · commit 9858b87fbb99 · 2009-11-14T15:34:37.000-08:00
Signed-off-by: Björn Gustavsson &lt;bgustavsson@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -1224,7 +1224,7 @@ _git_log ()
 
 __git_merge_options="
 	--no-commit --no-stat --log --no-log --squash --strategy
-	--commit --stat --no-squash --ff --no-ff
+	--commit --stat --no-squash --ff --no-ff --ff-only
 "
 
 _git_merge ()

Original file line number	Diff line number	Diff line change
`@@ -1224,7 +1224,7 @@ _git_log ()`
`1224`	`1224`
`1225`	`1225`	`__git_merge_options="`
`1226`	`1226`	`--no-commit --no-stat --log --no-log --squash --strategy`
`1227`		`- --commit --stat --no-squash --ff --no-ff`
	`1227`	`+ --commit --stat --no-squash --ff --no-ff --ff-only`
`1228`	`1228`	`"`
`1229`	`1229`
`1230`	`1230`	`_git_merge ()`