diff options
authorJunio C Hamano <>2005-05-14 01:40:54 (GMT)
committerPetr Baudis <>2005-05-15 00:05:03 (GMT)
commit99665af5c0be0fe4319b39183e84917993153576 (patch)
parent13ab4462d2aefb252d7c916bd537151856b7c967 (diff)
[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 <> Bundled with the changes in the unrenamed files. Signed-off-by: Petr Baudis <>
-rw-r--r--Documentation/git-diff-helper.txt (renamed from Documentation/git-diff-tree-helper.txt)0
-rw-r--r--diff-helper.c (renamed from diff-tree-helper.c)0
6 files changed, 5 insertions, 5 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]::
Generates patch format output for git-diff-*
diff --git a/Makefile b/Makefile
index 92b7cdf..23129c4 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ PROG= git-update-cache git-diff-files git-init-db git-write-tree \
git-check-files git-ls-tree git-merge-base git-merge-cache \
git-unpack-file git-export git-diff-cache git-convert-cache \
git-http-pull git-rpush git-rpull git-rev-list git-mktag \
- git-diff-tree-helper git-tar-tree git-local-pull git-write-blob \
+ git-diff-helper git-tar-tree git-local-pull git-write-blob \
all: $(PROG)
@@ -101,7 +101,7 @@ git-rpush: rsh.c
git-rpull: rsh.c pull.c
git-rev-list: rev-list.c
git-mktag: mktag.c
-git-diff-tree-helper: diff-tree-helper.c
+git-diff-helper: diff-helper.c
git-tar-tree: tar-tree.c
git-write-blob: write-blob.c
diff --git a/diff-tree-helper.c b/diff-helper.c
index 51bb658..51bb658 100644
--- a/diff-tree-helper.c
+++ b/diff-helper.c
diff --git a/diff.h b/diff.h
index 0b76cc4..c146d8a 100644
--- a/diff.h
+++ b/diff.h
@@ -17,7 +17,7 @@ extern void diff_change(unsigned mode1, unsigned mode2,
extern void diff_unmerge(const char *path);
-/* These are for diff-tree-helper */
+/* These are for diff-helper */
struct diff_spec {
unsigned char blob_sha1[20];