path.c: refactor relative_path(), not only strip prefix

diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index 056a9697c68a7de8655d6b9800e40ce3ffd92c48..c600b61e2b62013366476807c733837c0e854165 100644 (file)
--- a/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@ -1,21 +1,21 @@
 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
 --------
+[verse]
 'git whatchanged' <option>...
 
 DESCRIPTION
 -----------
 Shows commit logs and diff output each commit introduces.  The
-command internally invokes 'git-rev-list' piped to
-'git-diff-tree', and takes command line options for both of
+command internally invokes 'git rev-list' piped to
+'git diff-tree', and takes command line options for both of
 these commands.
 
 This manual page describes only the most frequently used options.
@@ -24,11 +24,11 @@ This manual page describes only the most frequently used options.
 OPTIONS
 -------
 -p::
-       Show textual diffs, instead of the git internal diff
+       Show textual diffs, instead of the Git internal diff
        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>::
@@ -36,26 +36,34 @@ OPTIONS
        exclusive, top inclusive).
 
 -r::
-       Show git internal diff output, but for the whole tree,
+       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
+       of its parents.
++
+However, it is not very useful in general, although it
+*is* useful on a file-by-file basis.
 
+include::pretty-options.txt[]
 
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>
+include::pretty-formats.txt[]
 
+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
 
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
+`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'
 
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[1] suite