diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-09 03:06:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-09 03:06:36 (GMT) |
| commit | ca1c9913f8ac0ccaf976d44822076e1bba5bcd94 (patch) | |
| tree | aa320cfc93864826fd28f0a84bac76d9f12a2d5e /contrib | |
| parent | 31a3c6bb45aa61e45f1663871620eaf742f0abbb (diff) | |
| parent | efb779f8873e5aa36be29a4e551186c62c1b580c (diff) | |
| download | git-ca1c9913f8ac0ccaf976d44822076e1bba5bcd94.zip git-ca1c9913f8ac0ccaf976d44822076e1bba5bcd94.tar.gz git-ca1c9913f8ac0ccaf976d44822076e1bba5bcd94.tar.bz2 | |
Merge branch 'sg/merge-options' (early part)
* 'sg/merge-options' (early part):
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 23db664..1698463 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 |