aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-08 20:06:36 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-08 20:06:36 -0700
commitca1c9913f8ac0ccaf976d44822076e1bba5bcd94 (patch)
treeaa320cfc93864826fd28f0a84bac76d9f12a2d5e /contrib
parent31a3c6bb45aa61e45f1663871620eaf742f0abbb (diff)
parentefb779f8873e5aa36be29a4e551186c62c1b580c (diff)
downloadgit-ca1c9913f8ac0ccaf976d44822076e1bba5bcd94.tar.gz
git-ca1c9913f8ac0ccaf976d44822076e1bba5bcd94.tar.xz
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-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 23db664f4..16984632d 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