diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-12 17:27:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-12 17:27:28 -0700 |
| commit | 5b2eeed1ba36caf71341c1557f2054681c353a14 (patch) | |
| tree | 716016eb1036804ea67163ac299c35ad8abedb7d /Documentation/rev-list-options.txt | |
| parent | a0e46390d397e71182e42930b98b6b59a1a84898 (diff) | |
| parent | 65347030590bcc251a9ff2ed96487a0f1b9e9fa8 (diff) | |
| download | git-5b2eeed1ba36caf71341c1557f2054681c353a14.tar.gz git-5b2eeed1ba36caf71341c1557f2054681c353a14.tar.xz | |
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
Diffstat (limited to 'Documentation/rev-list-options.txt')
| -rw-r--r-- | Documentation/rev-list-options.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 1d857559e..67ff0eab9 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -193,12 +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. |