summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-26 20:13:17 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-26 20:13:17 -0700
commitbf0c5bbe2566d756d7468331161461ea9fec3b1f (patch)
tree3179922b7a98d866fcf86406ac62c5825cb37f63 /contrib
parent8194fcaa1f0999064a170ed24d36be5432815dce (diff)
parent482ce70e14fdd5d03304a92f1740e6a9022e7958 (diff)
downloadgit-bf0c5bbe2566d756d7468331161461ea9fec3b1f.tar.gz
Merge branch 'mg/rev-list-n-parents'
* mg/rev-list-n-parents: tests: avoid nonportable {foo,bar} glob rev-list --min-parents,--max-parents: doc, test and completion revision.c: introduce --min-parents and --max-parents options t6009: use test_commit() from test-lib.sh
Diffstat (limited to 'contrib')
-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 1b589fadbb..840ae38760 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1577,6 +1577,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="