diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-17 13:57:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 13:57:58 -0800 |
| commit | 5a7a0fae8f964b5ad179018d6a50f25ef7550f97 (patch) | |
| tree | 126f1390f83cbddc7b67b70f25348b282944a772 /Documentation/rev-list-options.txt | |
| parent | d6b634fafdb5570d9c25d5176d3d32fe0b22530d (diff) | |
| parent | 1c7d402b3e1e9d7e50abfbfb18c88bc79be468ea (diff) | |
| download | git-5a7a0fae8f964b5ad179018d6a50f25ef7550f97.tar.gz | |
Merge branch 'maint'
* maint:
clean: remove redundant variable baselen
Documentation/git-pull: clarify configuration
Document that rev-list --graph triggers parent rewriting.
clean: avoid quoting twice
document sigchain api
Keep together options controlling the behaviour of diffcore-rename.
t3402: test "rebase -s<strategy> -X<opt>"
Diffstat (limited to 'Documentation/rev-list-options.txt')
| -rw-r--r-- | Documentation/rev-list-options.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 1aaaf5ae8b..42ca059908 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -95,6 +95,8 @@ you would get an output like this: to be printed in between commits, in order for the graph history to be drawn properly. + +This enables parent rewriting, see 'History Simplification' below. ++ This implies the '--topo-order' option by default, but the '--date-order' option may also be specified. |