Merge branch 'jt/test-protocol-version' into jt/fetch-no-update-shallow-in-proto-v2

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index cad711ce0ac060d9356e49599ffc13d130fc593c..ca959a72862048c205d67576fcd6c538f0c91b26 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -960,6 +960,13 @@ options may be given. See linkgit:git-diff-files[1] for more options.
        the parents have only two variants and the merge result picks
        one of them without modification.
 
+--combined-all-paths::
+       This flag causes combined diffs (used for merge commits) to
+       list the name of the file from all parents.  It thus only has
+       effect when -c or --cc are specified, and is likely only
+       useful if filename changes are detected (i.e. when either
+       rename or copy detection have been requested).
+
 -m::
        This flag makes the merge commits show the full diff like
        regular commits; for each merge parent, a separate log entry