From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Aug 2008 00:27:28 +0000 (-0700)
Subject: Merge branch 'jc/post-simplify' into tr/filter-branch
X-Git-Tag: v1.6.1-rc1~275^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5b2eeed1ba36caf71341c1557f2054681c353a14?ds=inline;hp=-c

Merge branch 'jc/post-simplify' into tr/filter-branch

* jc/post-simplify:
Topo-sort before --simplify-merges
revision traversal: show full history with merge simplification
revision.c: whitespace fix
---

5b2eeed1ba36caf71341c1557f2054681c353a14
diff --combined Documentation/rev-list-options.txt
index 1d857559ef,ee6822a85d..67ff0eab9f
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -71,7 -71,7 +71,7 @@@ For example, if you have this topology
           o---x---a---a  branch A
  -----------------------------------------------------------------------
  +
 -you would get an output line this:
 +you would get an output like this:
  +
  -----------------------------------------------------------------------
  	$ git rev-list --left-right --boundary --pretty=oneline A...B
@@@ -193,12 -193,18 +193,18 @@@ endif::git-rev-list[
  
  --full-history::
  
- 	Show also parts of history irrelevant to current state of a given
- 	path. This turns off history simplification, which removed merges
+ 	Show also parts of history irrelevant to current state of given
+ 	paths. This turns off history simplification, which removed merges
  	which didn't change anything at all at some child. It will still actually
  	simplify away merges that didn't change anything at all into either
  	child.
  
+ --simplify-merges::
+ 
+ 	Simplify away commits that did not change the given paths, similar
+ 	to `--full-history`, and further remove merges none of whose
+ 	parent history changes the given paths.
+ 
  --no-merges::
  
  	Do not print commits with more than one parent.
@@@ -264,10 -270,11 +270,10 @@@ With '\--pretty' format other than onel
  this causes the output to have two extra lines of information
  taken from the reflog.  By default, 'commit@\{Nth}' notation is
  used in the output.  When the starting commit is specified as
 -'commit@{now}', output also uses 'commit@\{timestamp}' notation
 +'commit@\{now}', output also uses 'commit@\{timestamp}' notation
  instead.  Under '\--pretty=oneline', the commit message is
  prefixed with this information on the same line.
 -
 -Cannot be combined with '\--reverse'.
 +This option cannot be combined with '\--reverse'.
  See also linkgit:git-reflog[1].
  
  --merge::