projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d58f927
)
bash: add the merge option --ff-only
author
Björn Gustavsson
<bgustavsson@gmail.com>
Wed, 11 Nov 2009 04:49:07 +0000
(
05:49
+0100)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 14 Nov 2009 23:34:37 +0000
(15:34 -0800)
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash
patch
|
blob
|
history
diff --git
a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index e3ddecc995eb30391639983d9f6f0db7567d7b9a..a0917d18095f63abd1935be33e8fbcdfb6b2b6fa 100755
(executable)
--- 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 ()