From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Aug 2008 04:40:05 +0000 (-0700)
Subject: Merge branch 'jc/post-simplify' into tr/rev-list-docs
X-Git-Tag: v1.6.1-rc1~275^2^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=00b718e02d97c956cade8c1b4cbe29a9d3e92765;p=git.git

Merge branch 'jc/post-simplify' into tr/rev-list-docs

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

Conflicts:
	Documentation/rev-list-options.txt
---

00b718e02d97c956cade8c1b4cbe29a9d3e92765
diff --cc Documentation/rev-list-options.txt
index 0ce3f7fbd,ee6822a85..059ae69d8
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -193,6 -191,20 +193,12 @@@ endif::git-rev-list[
  
  	Stop when a given path disappears from the tree.
  
 ---full-history::
 -
 -	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.