From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Feb 2015 18:15:22 +0000 (-0800)
Subject: Merge branch 'jc/doc-log-rev-list-options'
X-Git-Tag: v2.4.0-rc0~122
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a23069ce045b271de98aff257ca68cc1952cc571?hp=-c

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?
---

a23069ce045b271de98aff257ca68cc1952cc571
diff --combined Documentation/rev-list-options.txt
index 0f3d460d34,c88d5e142c..4ed8587c84
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -66,10 -66,6 +66,10 @@@ if it is part of the log message
  	Limit the commits output to ones that match all given `--grep`,
  	instead of ones that match at least one.
  
 +--invert-grep::
 +	Limit the commits output to ones with log message that do not
 +	match the pattern specified with `--grep=<pattern>`.
 +
  -i::
  --regexp-ignore-case::
  	Match the regular expression limiting patterns without regard to letter
@@@ -164,7 -160,7 +164,7 @@@ parents) and `--max-parents=-1` (negati
  	consider. Repetitions of this option accumulate exclusion patterns
  	up to the next `--all`, `--branches`, `--tags`, `--remotes`, or
  	`--glob` option (other options or arguments do not clear
 -	accumlated patterns).
 +	accumulated patterns).
  +
  The patterns given should not begin with `refs/heads`, `refs/tags`, or
  `refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`,
@@@ -176,11 -172,6 +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 -639,7 +643,7 @@@ Object Traversa
  
  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
@@@ -657,18 -649,19 +653,24 @@@
  --objects-edge::
  	Similar to `--objects`, but also print the IDs of excluded
  	commits prefixed with a ``-'' character.  This is used by
 -	linkgit:git-pack-objects[1] to build ``thin'' pack, which records
 +	linkgit:git-pack-objects[1] to build a ``thin'' pack, which records
  	objects in deltified form based on objects contained in these
  	excluded commits to reduce network traffic.
  
 +--objects-edge-aggressive::
 +	Similar to `--objects-edge`, but it tries harder to find excluded
 +	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.