summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-10-16 12:23:59 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-10-16 12:23:59 -0700
commitf865a2ad981f72423aa1c19412ce57c543801957 (patch)
tree8c324c2c13e0fb3d0e8b60ce4e977620dba1a34f
parentWe do not depend on patch. (diff)
parentwhatchanged: document -m option from git-diff-tree. (diff)
downloadtgif-f865a2ad981f72423aa1c19412ce57c543801957.tar.xz
Merge branch 'fixes'
-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 8a2212de64..e6f57d9bc1 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
------