diff options
| author | Björn Gustavsson <bgustavsson@gmail.com> | 2009-11-11 07:49:07 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 02:34:37 +0300 |
| commit | 9858b87fbb990659ea98f1bc77c2e0283cdcaa4a (patch) | |
| tree | 7147b299f58772101dfc9a11e43d1da6c5d4bc26 /contrib | |
| parent | d58f927c481646fc6c75b3bfc6368cb0096d074d (diff) | |
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')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index e3ddecc995..a0917d1809 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 () |