Merge branch 'dp/clean-fix'

[git.git] / Documentation / git-whatchanged.txt

diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index 54947b676969585c4641bf7a4f538623e059dd15..a6e7bd4c8b99ad2d6a19acf4a412b81580ef3027 100644 (file)
--- a/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@ -38,11 +38,6 @@ OPTIONS
        Show git internal diff output, but for the whole tree,
        not just the top level.
 
        Show git internal diff output, but for the whole tree,
        not just the top level.
 

---pretty=<format>::
-       Controls the output format for the commit logs.
-       <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
 -m::
        By default, differences for merge commits are not shown.
        With this flag, show differences to that commit from all


@@ -51,6 +46,10 @@ OPTIONS
 However, it is not very useful in general, although it
 *is* useful on a file-by-file basis.
 
 However, it is not very useful in general, although it
 *is* useful on a file-by-file basis.
 

+include::pretty-options.txt[]
+
+include::pretty-formats.txt[]
+

 Examples
 --------
 git-whatchanged -p v2.6.12.. include/scsi drivers/scsi::
 Examples
 --------
 git-whatchanged -p v2.6.12.. include/scsi drivers/scsi::