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: http://git.ipfire.org/?a=commitdiff_plain;h=a23069ce045b271de98aff257ca68cc1952cc571;p=thirdparty%2Fgit.git

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 --cc Documentation/rev-list-options.txt
index 0f3d460d34,c88d5e142c..4ed8587c84
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -661,11 -653,11 +657,16 @@@ ifdef::git-rev-list[
  	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.