summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2011-03-23 10:38:51 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-23 10:20:24 -0700
commit6a6ebded7f2288d098f825f97cb2c210f0344497 (patch)
tree8186b099cd6f18596fdc0f95865f081cf8fbe8e6 /contrib/completion
parentrevision.c: introduce --min-parents and --max-parents options (diff)
downloadtgif-6a6ebded7f2288d098f825f97cb2c210f0344497.tar.xz
rev-list --min-parents,--max-parents: doc, test and completion
This also adds test for "--merges" and "--no-merges" which we did not have so far. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/completion')
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 893b7716ca..628970a8ae 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1572,6 +1572,8 @@ __git_log_common_options="
--max-count=
--max-age= --since= --after=
--min-age= --until= --before=
+ --min-parents= --max-parents=
+ --no-min-parents --no-max-parents
"
# Options that go well for log and gitk (not shortlog)
__git_log_gitk_options="