mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2008-08-12 21:40:05 -07:00
parent 70d9895ebc 6534703059
commit 00b718e02d
4 changed files with 251 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/rev-list-options.txt
View File

@ -193,6 +193,12 @@ endif::git-rev-list[]
Stop when a given path disappears from the tree.
--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.