git-shortlog.txt: improve documentation about .mailmap files

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

diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index 54947b676969585c4641bf7a4f538623e059dd15..cadfbd90403766d44598c8d96d89dc5a0e4e2ef8 100644 (file)
--- a/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@ -8,7 +8,7 @@ git-whatchanged - Show logs with difference each commit introduces
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-whatchanged' <option>...
+'git whatchanged' <option>...

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -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,14 +46,18 @@ 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
 --------
 Examples
 --------

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

 
        Show as patches the commits since version 'v2.6.12' that changed
        any file in the include/scsi or drivers/scsi subdirectories
 
 
        Show as patches the commits since version 'v2.6.12' that changed
        any file in the include/scsi or drivers/scsi subdirectories
 

-git-whatchanged --since="2 weeks ago" \-- gitk::
+git whatchanged --since="2 weeks ago" \-- gitk::

 
        Show the changes during the last two weeks to the file 'gitk'.
        The "--" is necessary to avoid confusion with the *branch* named
 
        Show the changes during the last two weeks to the file 'gitk'.
        The "--" is necessary to avoid confusion with the *branch* named


@@ -68,7 +67,7 @@ git-whatchanged --since="2 weeks ago" \-- gitk::
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and

-Junio C Hamano <junkio@cox.net>
+Junio C Hamano <gitster@pobox.com>

 
 
 Documentation
 
 
 Documentation


@@ -77,4 +76,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
 
 GIT
 ---

-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite