summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-21 13:57:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-21 13:57:52 (GMT)
commitb52ac60bc461a16076209a3027bb15f7c890f148 (patch)
treef16de68f0513127fff42a457a9ff56a3f0f37132 /Documentation
parentd0975a0724cc8f0f88931264b8b97c8a4c428dda (diff)
parent669b1d2aaec73ba762bf566078308075886ca208 (diff)
downloadgit-b52ac60bc461a16076209a3027bb15f7c890f148.zip
git-b52ac60bc461a16076209a3027bb15f7c890f148.tar.gz
git-b52ac60bc461a16076209a3027bb15f7c890f148.tar.bz2
Merge branch 'md/exclude-promisor-objects-fix' into maint
Operations on promisor objects make sense in the context of only a small subset of the commands that internally use the revisions machinery, but the "--exclude-promisor-objects" option were taken and led to nonsense results by commands like "log", to which it didn't make much sense. This has been corrected. * md/exclude-promisor-objects-fix: exclude-promisor-objects: declare when option is allowed Documentation/git-log.txt: do not show --exclude-promisor-objects
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/rev-list-options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 7b27363..21978eb 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -756,7 +756,6 @@ Unexpected missing objects will raise an error.
+
The form '--missing=print' is like 'allow-any', but will also print a
list of the missing objects. Object IDs are prefixed with a ``?'' character.
-endif::git-rev-list[]
--exclude-promisor-objects::
(For internal use only.) Prefilter object traversal at
@@ -764,6 +763,7 @@ endif::git-rev-list[]
stronger than `--missing=allow-promisor` because it limits the
traversal, rather than just silencing errors about missing
objects.
+endif::git-rev-list[]
--no-walk[=(sorted|unsorted)]::
Only show the given commits, but do not traverse their ancestors.