Merge branch 'jc/clean-config'

diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index db2efea14cf00335d5bb470a1b42f6cbe452c2e0..607df48f09254f2c93ad41e75ed976b092711dff 100644 (file)
--- a/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@ -1,15 +1,14 @@
 git-whatchanged(1)
 ==================
-v0.99.4, Aug 2005
 
 NAME
 ----
-git-whatchanged - Show logs with difference each commit introduces.
+git-whatchanged - Show logs with difference each commit introduces
 
 
 SYNOPSIS
 --------
-'git whatchanged' <option>...
+'git-whatchanged' <option>...
 
 DESCRIPTION
 -----------
@@ -28,7 +27,7 @@ OPTIONS
        output format that is useful only to tell the changed
        paths and their nature of changes.
 
---max-count=<n>::
+-<n>::
        Limit output to <n> commits.
 
 <since>..<until>::
@@ -48,9 +47,23 @@ OPTIONS
        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.
+
+Examples
+--------
+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
+
+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
+       'gitk'
 
-       However, it is not very useful in general, although it
-       *is* useful on a file-by-file basis.
 
 Author
 ------
@@ -65,4 +78,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 GIT
 ---
 Part of the gitlink:git[7] suite
-