diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-03 13:18:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-03 13:18:20 -0700 |
| commit | ec845695c4e6d7b689c3eb0b53d1b2ba4803c7ea (patch) | |
| tree | b02046a790e4a291d96042ea308841926c61c937 /contrib | |
| parent | e4b9c36ca40a0869ee5fc64aaeabaf2655ef595b (diff) | |
| parent | efb779f8873e5aa36be29a4e551186c62c1b580c (diff) | |
| download | git-ec845695c4e6d7b689c3eb0b53d1b2ba4803c7ea.tar.xz | |
Merge commit 'sg/merge-options^' into jk/renamelimit
* commit 'sg/merge-options^':
merge, pull: add '--(no-)log' command line option
fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
add 'merge.stat' config variable
merge, pull: introduce '--(no-)stat' option
doc: moved merge.* config variables into separate merge-config.txt
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 23db664f48..16984632d9 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -780,7 +780,7 @@ _git_merge () ;; --*) __gitcomp " - --no-commit --no-summary --squash --strategy + --no-commit --no-stat --log --no-log --squash --strategy " return esac |