diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-16 23:21:38 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-16 23:21:38 +0400 |
| commit | b71d01ef3cb9dfc41b32f360c2b10403b37c0e7a (patch) | |
| tree | a78502154445405169f998f3b8498d0694a3b7ca /Documentation | |
| parent | ea56188a2488eff449661e2b4de656f38c88e62d (diff) | |
| parent | 15fad5f4d750da31fbc004e6dd4c78fc0f20aca4 (diff) | |
Merge branch 'fixes'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-whatchanged.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt index 056a9697c6..db2efea14c 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 ------ |