Merge branch 'fixes'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 2684fa9393cdc7859e91c01ea6a42bfa92a58143..e14102127958d98b1bf37a8d7560320249495ad7 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -363,9 +363,6 @@ gitlink:git-count-objects[1]::
 gitlink:git-daemon[1]::
        A really simple server for GIT repositories.
 
-gitlink:git-diff-helper[1]::
-       Generates patch format output for git-diff-*
-
 gitlink:git-get-tar-commit-id[1]::
        Extract commit ID from an archive created using git-tar-tree.