summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-21 06:24:39 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-22 08:54:13 (GMT)
commit5cfcd07c931e6029a77f9393309f7d0ec7cdc118 (patch)
tree02ff16ec4156147c6a9b744033259d5c867837e4 /Documentation
parent9dcc829fe13b7c843a1df6c38479d5b8b8c7d20f (diff)
downloadgit-5cfcd07c931e6029a77f9393309f7d0ec7cdc118.zip
git-5cfcd07c931e6029a77f9393309f7d0ec7cdc118.tar.gz
git-5cfcd07c931e6029a77f9393309f7d0ec7cdc118.tar.bz2
Retire diff-helper.
The textual diff generation with built-in '-p' in diff-* brothers has proven to be useful enough that git-diff-helper outlived its usefulness. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-format.txt3
-rw-r--r--Documentation/git-diff-helper.txt53
-rw-r--r--Documentation/git.txt3
3 files changed, 1 insertions, 58 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 424e75a..6e9fa8c 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -62,8 +62,7 @@ When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
with a '-p' option, they do not produce the output described above;
instead they produce a patch file.
-The patch generation can be customized at two levels. This
-customization also applies to "git-diff-helper".
+The patch generation can be customized at two levels.
1. When the environment variable 'GIT_EXTERNAL_DIFF' is not set,
these commands internally invoke "diff" like this:
diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt
deleted file mode 100644
index 047e392..0000000
--- a/Documentation/git-diff-helper.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-git-diff-helper(1)
-==================
-v0.1, May 2005
-
-NAME
-----
-git-diff-helper - Generates patch format output for git-diff-*
-
-
-SYNOPSIS
---------
-'git-diff-helper' [-z] [-S<string>] [-O<orderfile>]
-
-DESCRIPTION
------------
-Reads output from "git-diff-index", "git-diff-tree" and "git-diff-files" and
-generates patch format output.
-
-OPTIONS
--------
--z::
- \0 line termination on input
-
--S<string>::
- Look for differences that contains the change in <string>.
-
---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
---------
-The section on generating patches in gitlink:git-diff-index[1]
-
-
-Author
-------
-Written by Junio C Hamano <junkio@cox.net>
-
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
-GIT
----
-Part of the gitlink:git[7] suite
-
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 2684fa939..e141021 100644
--- 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.