Merge with master.

diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt
index 3c5d8fdf2b1e02eb36ca3e4d58a241406927975b..d826deb42e1974b57b07ddd09aae38295ac6b654 100644 (file)
--- a/Documentation/git-diff-helper.txt
+++ b/Documentation/git-diff-helper.txt
@@ -1,5 +1,5 @@
 git-diff-helper(1)
-=======================
+==================
 v0.1, May 2005
 
 NAME
@@ -9,7 +9,7 @@ git-diff-helper - Generates patch format output for git-diff-*
 
 SYNOPSIS
 --------
-'git-diff-helper' [-z] [-R] [-M]
+'git-diff-helper' [-z] [-S<string>] [-O<orderfile>]
 
 DESCRIPTION
 -----------
@@ -21,19 +21,17 @@ OPTIONS
 -z::
        \0 line termination on input
 
--R::
-       Output diff in reverse.  This is useful for displaying output from
-       "git-diff-cache" which always compares tree with cache or working
-       file.  E.g.
+-S<string>::
+       Look for differences that contains the change in <string>.
 
-               git-diff-cache <tree> | git-diff-helper -R file.c
-
-       would show a diff to bring the working file back to what
-       is in the <tree>.
-
--M::
-       Detect renames.
+--pickaxe-all::
+       When -S finds a change, show all the changes in that
+       changeset, not just the files that contains the change
+       in <string>.
 
+-O<orderfile>::
+       Output the patch in the order specified in the
+       <orderfile>, which has one shell glob pattern per line.
 
 See Also
 --------