summaryrefslogtreecommitdiff
path: root/object.h
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2022-08-19 04:28:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-08-19 17:45:08 (GMT)
commit257418c59040c13bfa839e01922e21833cda6a52 (patch)
tree5f511f47be827d91b3a11bfcf973dfe951c3b424 /object.h
parent1838e21cff17f97900a4987b35ba70ca48bce4b7 (diff)
downloadgit-257418c59040c13bfa839e01922e21833cda6a52.zip
git-257418c59040c13bfa839e01922e21833cda6a52.tar.gz
git-257418c59040c13bfa839e01922e21833cda6a52.tar.bz2
revision: allow --ancestry-path to take an argument
We have long allowed users to run e.g. git log --ancestry-path master..seen which shows all commits which satisfy all three of these criteria: * are an ancestor of seen * are not an ancestor of master * have master as an ancestor This commit allows another variant: git log --ancestry-path=$TOPIC master..seen which shows all commits which satisfy all of these criteria: * are an ancestor of seen * are not an ancestor of master * have $TOPIC in their ancestry-path that last bullet can be defined as commits meeting any of these criteria: * are an ancestor of $TOPIC * have $TOPIC as an ancestor * are $TOPIC This also allows multiple --ancestry-path arguments, which can be used to find commits with any of the given topics in their ancestry path. Signed-off-by: Elijah Newren <newren@gmail.com> Acked-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'object.h')
-rw-r--r--object.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/object.h b/object.h
index a221946..9caef89 100644
--- a/object.h
+++ b/object.h
@@ -59,7 +59,7 @@ struct object_array {
/*
* object flag allocation:
- * revision.h: 0---------10 15 23------26
+ * revision.h: 0---------10 15 23------27
* fetch-pack.c: 01 67
* negotiator/default.c: 2--5
* walker.c: 0-2