From 15fad5f4d750da31fbc004e6dd4c78fc0f20aca4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 15 Oct 2005 23:49:27 -0700 Subject: 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 --- Documentation/git-whatchanged.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt index 056a9697c..db2efea14 100644 --- a/Documentation/git-whatchanged.txt +++ b/Documentation/git-whatchanged.txt @@ -44,6 +44,13 @@ OPTIONS 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 ------ -- cgit v1.2.1