summaryrefslogtreecommitdiffstats
path: root/revision.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-02-18 01:25:05 +0100
committerJunio C Hamano <gitster@pobox.com>2022-02-18 01:25:05 +0100
commit708cbef33a2c905c920e94b70d0946f9f4ff3a4e (patch)
tree97c45e78e356cdfc71deb5f57499d3e2f5e8ae45 /revision.h
parentMerge branch 'jz/patch-id-hunk-header-parsing-fix' (diff)
parentgit-rev-list: add --exclude-first-parent-only flag (diff)
downloadgit-708cbef33a2c905c920e94b70d0946f9f4ff3a4e.tar.xz
git-708cbef33a2c905c920e94b70d0946f9f4ff3a4e.zip
Merge branch 'jz/rev-list-exclude-first-parent-only'
"git log" and friends learned an option --exclude-first-parent-only to propagate UNINTERESTING bit down only along the first-parent chain, just like --first-parent option shows commits that lack the UNINTERESTING bit only along the first-parent chain. * jz/rev-list-exclude-first-parent-only: git-rev-list: add --exclude-first-parent-only flag
Diffstat (limited to 'revision.h')
-rw-r--r--revision.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.h b/revision.h
index 3c58c18c63..e16d06f29d 100644
--- a/revision.h
+++ b/revision.h
@@ -158,6 +158,7 @@ struct rev_info {
bisect:1,
ancestry_path:1,
first_parent_only:1,
+ exclude_first_parent_only:1,
line_level_traverse:1,
tree_blobs_in_commit_order:1,
@@ -402,7 +403,7 @@ const char *get_revision_mark(const struct rev_info *revs,
void put_revision_mark(const struct rev_info *revs,
const struct commit *commit);
-void mark_parents_uninteresting(struct commit *commit);
+void mark_parents_uninteresting(struct rev_info *revs, struct commit *commit);
void mark_tree_uninteresting(struct repository *r, struct tree *tree);
void mark_trees_uninteresting_sparse(struct repository *r, struct oidset *trees);