summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-17 18:15:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-02-17 18:15:22 (GMT)
commita23069ce045b271de98aff257ca68cc1952cc571 (patch)
treec902d0cae36fddf46a3befc3953431b4a4e8c618
parent38459ee6afa0ce8aef81f5022aa9bd9260e0fdd7 (diff)
parent3cab02de5087447e1c48ada03a0db0fffc89e920 (diff)
downloadgit-a23069ce045b271de98aff257ca68cc1952cc571.zip
git-a23069ce045b271de98aff257ca68cc1952cc571.tar.gz
git-a23069ce045b271de98aff257ca68cc1952cc571.tar.bz2
Merge branch 'jc/doc-log-rev-list-options'
"git log --help" used to show rev-list options that are irrelevant to the "log" command. * jc/doc-log-rev-list-options: Documentation: what does "git log --indexed-objects" even mean?
-rw-r--r--Documentation/rev-list-options.txt12
1 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 0f3d460..4ed8587 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -176,11 +176,6 @@ explicitly.
Pretend as if all objects mentioned by reflogs are listed on the
command line as `<commit>`.
---indexed-objects::
- Pretend as if all trees and blobs used by the index are listed
- on the command line. Note that you probably want to use
- `--objects`, too.
-
--ignore-missing::
Upon seeing an invalid object name in the input, pretend as if
the bad input was not given.
@@ -648,6 +643,7 @@ Object Traversal
These options are mostly targeted for packing of Git repositories.
+ifdef::git-rev-list[]
--objects::
Print the object IDs of any object referenced by the listed
commits. `--objects foo ^bar` thus means ``send me
@@ -666,9 +662,15 @@ These options are mostly targeted for packing of Git repositories.
commits at the cost of increased time. This is used instead of
`--objects-edge` to build ``thin'' packs for shallow repositories.
+--indexed-objects::
+ Pretend as if all trees and blobs used by the index are listed
+ on the command line. Note that you probably want to use
+ `--objects`, too.
+
--unpacked::
Only useful with `--objects`; print the object IDs that are not
in packs.
+endif::git-rev-list[]
--no-walk[=(sorted|unsorted)]::
Only show the given commits, but do not traverse their ancestors.