summaryrefslogtreecommitdiff
path: root/Documentation/git-whatchanged.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-16 06:49:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-16 06:49:27 (GMT)
commit15fad5f4d750da31fbc004e6dd4c78fc0f20aca4 (patch)
tree3726fe71153ea2df92eadeae891b614aef5ba082 /Documentation/git-whatchanged.txt
parent5990efb0c4f6d1a19c4702bf50ef8cc5ac902a78 (diff)
downloadgit-15fad5f4d750da31fbc004e6dd4c78fc0f20aca4.zip
git-15fad5f4d750da31fbc004e6dd4c78fc0f20aca4.tar.gz
git-15fad5f4d750da31fbc004e6dd4c78fc0f20aca4.tar.bz2
whatchanged: document -m option from git-diff-tree.
The documentation for git-whatchanged is meant to describe only the most frequently used options from git-diff-tree. Because "why doesn't it show merges" was asked more than once, we'd better describe '-m' option there. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-whatchanged.txt')
-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 056a969..db2efea 100644
--- a/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@ -44,6 +44,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
------