aboutsummaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorBjörn Gustavsson <bgustavsson@gmail.com>2009-11-11 05:49:07 +0100
committerJunio C Hamano <gitster@pobox.com>2009-11-14 15:34:37 -0800
commit9858b87fbb990659ea98f1bc77c2e0283cdcaa4a (patch)
tree7147b299f58772101dfc9a11e43d1da6c5d4bc26 /contrib/completion
parentd58f927c481646fc6c75b3bfc6368cb0096d074d (diff)
downloadgit-9858b87fbb990659ea98f1bc77c2e0283cdcaa4a.tar.gz
git-9858b87fbb990659ea98f1bc77c2e0283cdcaa4a.tar.xz
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>
Diffstat (limited to 'contrib/completion')
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e3ddecc99..a0917d180 100755
--- 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 ()