diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-12 21:40:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-12 21:40:05 -0700 |
| commit | 00b718e02d97c956cade8c1b4cbe29a9d3e92765 (patch) | |
| tree | 74f04a8d21f6903b066b77920bb59684ce7a5632 /Documentation | |
| parent | 70d9895ebcb8d401b569d28f049ad37fcb7b5ade (diff) | |
| parent | 65347030590bcc251a9ff2ed96487a0f1b9e9fa8 (diff) | |
| download | git-00b718e02d97c956cade8c1b4cbe29a9d3e92765.tar.gz git-00b718e02d97c956cade8c1b4cbe29a9d3e92765.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/rev-list-options.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 0ce3f7fbd..059ae69d8 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -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. |