summaryrefslogtreecommitdiff
path: root/revision.h
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 /revision.h
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 'revision.h')
-rw-r--r--revision.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/revision.h b/revision.h
index ae948601f9..9fd8f3016f 100644
--- a/revision.h
+++ b/revision.h
@@ -41,8 +41,6 @@ struct rev_info {
/* Traversal flags */
unsigned int dense:1,
prune:1,
- no_merges:1,
- merges_only:1,
no_walk:1,
show_all:1,
remove_empty_trees:1,
@@ -126,6 +124,8 @@ struct rev_info {
int max_count;
unsigned long max_age;
unsigned long min_age;
+ int min_parents;
+ int max_parents;
/* diff info for patches and for paths limiting */
struct diff_options diffopt;