summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-22 20:42:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-22 20:42:57 (GMT)
commit9af3a7cb4d6d2aa7807b1f0d0e5b5b8605177413 (patch)
tree3659dd767c0cbe16b12241b8dbfe060c89007d25 /revision.h
parent82fa169d551d71fd21d8a6368040e19d209f79ab (diff)
parent8d049e182e2e213a012e2d6839becfe0e2de79db (diff)
downloadgit-9af3a7cb4d6d2aa7807b1f0d0e5b5b8605177413.zip
git-9af3a7cb4d6d2aa7807b1f0d0e5b5b8605177413.tar.gz
git-9af3a7cb4d6d2aa7807b1f0d0e5b5b8605177413.tar.bz2
Merge branch 'ds/revision-show-pulls'
"git log" learned "--show-pulls" that helps pathspec limited history views; a merge commit that takes the whole change from a side branch, which is normally omitted from the output, is shown in addition to the commits that introduce real changes. * ds/revision-show-pulls: revision: --show-pulls adds helpful merges
Diffstat (limited to 'revision.h')
-rw-r--r--revision.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/revision.h b/revision.h
index 0f962e4..c1af164 100644
--- a/revision.h
+++ b/revision.h
@@ -34,6 +34,9 @@
#define SYMMETRIC_LEFT (1u<<8)
#define PATCHSAME (1u<<9)
#define BOTTOM (1u<<10)
+
+/* WARNING: This is also used as REACHABLE in commit-graph.c. */
+#define PULL_MERGE (1u<<15)
/*
* Indicates object was reached by traversal. i.e. not given by user on
* command-line or stdin.
@@ -43,7 +46,7 @@
*/
#define NOT_USER_GIVEN (1u<<25)
#define TRACK_LINEAR (1u<<26)
-#define ALL_REV_FLAGS (((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR)
+#define ALL_REV_FLAGS (((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR | PULL_MERGE)
#define TOPO_WALK_EXPLORED (1u<<27)
#define TOPO_WALK_INDEGREE (1u<<28)
@@ -129,6 +132,7 @@ struct rev_info {
no_walk:2,
remove_empty_trees:1,
simplify_history:1,
+ show_pulls:1,
topo_order:1,
simplify_merges:1,
simplify_by_decoration:1,