diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-16 19:23:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-16 19:23:59 (GMT) |
| commit | f865a2ad981f72423aa1c19412ce57c543801957 (patch) | |
| tree | 8c324c2c13e0fb3d0e8b60ce4e977620dba1a34f /Documentation/git-whatchanged.txt | |
| parent | a34484e1c926ff21279d2f178534c1f9565c7f4d (diff) | |
| parent | 15fad5f4d750da31fbc004e6dd4c78fc0f20aca4 (diff) | |
| download | git-f865a2ad981f72423aa1c19412ce57c543801957.zip git-f865a2ad981f72423aa1c19412ce57c543801957.tar.gz git-f865a2ad981f72423aa1c19412ce57c543801957.tar.bz2 | |
Merge branch 'fixes'
Diffstat (limited to 'Documentation/git-whatchanged.txt')
| -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 8a2212d..e6f57d9 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 ------ |