diff-tree: don't print multiple headers for merges when silent.

[git.git] / Documentation / git-diff-helper.txt

diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt
index 58f2717..2036c6c 100644 (file)
--- a/Documentation/git-diff-helper.txt
+++ b/Documentation/git-diff-helper.txt
@@ -1,15 +1,15 @@
-git-diff-tree-helper(1)
-=======================
+git-diff-helper(1)
+==================
 v0.1, May 2005
 
 NAME
 ----
-git-diff-tree-helper - Generates patch format output for git-diff-*
+git-diff-helper - Generates patch format output for git-diff-*
 
 
 SYNOPSIS
 --------
-'git-diff-tree-helper' [-z] [-R]
+'git-diff-helper' [-z] [-R] [-M] [-C] [-S<string>]
 
 DESCRIPTION
 -----------
@@ -26,9 +26,20 @@ OPTIONS
        "git-diff-cache" which always compares tree with cache or working
        file.  E.g.
 
-               git-diff-cache <tree> | git-diff-tree-helper -R file.c
-+
-would show a diff to bring the working file back to what is in the <tree>.
+               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.
+
+-C::
+       Detect copies as well as renames.
+
+-S<string>::
+       Look for differences that contains the change in <string>.
+
 
 See Also
 --------
@@ -37,7 +48,8 @@ The section on generating patches in link:git-diff-cache.html[git-diff-cache]
 
 Author
 ------
-Written by Linus Torvalds <torvalds@osdl.org>
+Written by Junio C Hamano <junkio@cox.net>
+
 
 Documentation
 --------------