Merge branch 'jc/post-simplify' into tr/filter-branch

[thirdparty/git.git] / Documentation / rev-list-options.txt

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