aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/git-whatchanged.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index 8a2212de6..e6f57d9bc 100644
--- a/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@ -43,6 +43,13 @@ OPTIONS
<format> can be one of 'raw', 'medium', 'short', 'full',
and 'oneline'.
+-m::
+ By default, differences for merge commits are not shown.
+ With this flag, show differences to that commit from all
+ of its parents.
+
+ However, it is not very useful in general, although it
+ *is* useful on a file-by-file basis.
Author
------