bash: add the merge option --ff-only
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Björn Gustavsson committed
Nov 11, 2009 at 05:49 UTC
9858b87fbb990659ea98f1bc77c2e0283cdcaa4a
1 file changed
+1
-1
contrib/completion/git-completion.bash
+1
-1
@@ -1224,7 +1224,7 @@ _git_log ()
1224
1225
__git_merge_options="
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
"
1229
1230
_git_merge ()