Merge branch 'mg/reset-doc' into maint

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 1aaaf5ae8b990ce2b0a49c55aba50776727c37fe..42ca059908b6af5726d958d92912705c96235d29 100644 (file)
--- 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.