summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-14 01:40:54 (GMT)
committerPetr Baudis <xpasky@machine.sinus.cz>2005-05-15 00:05:03 (GMT)
commit99665af5c0be0fe4319b39183e84917993153576 (patch)
treedf3d05b66e546714a1411c0f131a90ffcd367cd5 /Documentation
parent13ab4462d2aefb252d7c916bd537151856b7c967 (diff)
downloadgit-99665af5c0be0fe4319b39183e84917993153576.zip
git-99665af5c0be0fe4319b39183e84917993153576.tar.gz
git-99665af5c0be0fe4319b39183e84917993153576.tar.bz2
[PATCH 2/3] Rename git-diff-tree-helper to git-diff-helper.
It used to be that diff-tree needed helper support to parse its raw output to generate diffs, but these days git-diff-* family produces the same output and the helper is not tied to diff-tree anymore. Drop "tree" from its name. This commit is done separately to record just the rename and no file content changes. The changes in the renamed files are recorded in the next commit. Signed-off-by: Junio C Hamano <junkio@cox.net> Bundled with the changes in the unrenamed files. Signed-off-by: Petr Baudis <pasky@ucw.cz>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-format.txt2
-rw-r--r--Documentation/git-diff-helper.txt (renamed from Documentation/git-diff-tree-helper.txt)0
-rw-r--r--Documentation/git.txt2
3 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 1a99e85..9e64539 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -45,7 +45,7 @@ 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-tree-helper".
+customization also applies to "git-diff-helper".
1. When the environment variable 'GIT_EXTERNAL_DIFF' is not set,
these commands internally invoke "diff" like this:
diff --git a/Documentation/git-diff-tree-helper.txt b/Documentation/git-diff-helper.txt
index 58f2717..58f2717 100644
--- a/Documentation/git-diff-tree-helper.txt
+++ b/Documentation/git-diff-helper.txt
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 98d923d..134afff 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -149,7 +149,7 @@ link:git-rpull.html[git-rpull]::
Interogators:
-link:git-diff-tree-helper.html[git-diff-tree-helper]::
+link:git-diff-helper.html[git-diff-helper]::
Generates patch format output for git-diff-*
link:git-rpush.html[git-rpush]::