path: root/Documentation/git-diff-helper.txt
diff options
authorJunio C Hamano <>2005-05-19 10:32:35 (GMT)
committerLinus Torvalds <>2005-05-19 15:59:40 (GMT)
commit5c97558c9a813a0a775c438a79cfc438def00c22 (patch)
tree59b9eaa38cd2ec6f846ed2f2b6767055022a227a /Documentation/git-diff-helper.txt
parenta310d4349467d78266f38d29e500c77b96ee5bef (diff)
[PATCH] Detect renames in diff family.
This rips out the rename detection engine from diff-helper and moves it to the diff core, and updates the internal calling convention used by diff-tree family into the diff core. In order to give the same option name to diff-tree family as well as to diff-helper, I've changed the earlier diff-helper '-r' option to '-M' (stands for Move; sorry but the natural abbreviation 'r' for 'rename' is already taken for 'recursive'). Although I did a fair amount of test with the git-diff-tree with existing rename commits in the core GIT repository, this should still be considered beta (preview) release. This patch depends on the diff-delta infrastructure just committed. This implements almost everything I wanted to see in this series of patch, except a few minor cleanups in the calling convention into diff core, but that will be a separate cleanup patch. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'Documentation/git-diff-helper.txt')
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt
index e930f97..3c5d8fd 100644
--- a/Documentation/git-diff-helper.txt
+++ b/Documentation/git-diff-helper.txt
@@ -9,7 +9,7 @@ git-diff-helper - Generates patch format output for git-diff-*
-'git-diff-helper' [-z] [-R] [-r]
+'git-diff-helper' [-z] [-R] [-M]
@@ -31,7 +31,7 @@ OPTIONS
would show a diff to bring the working file back to what
is in the <tree>.
Detect renames.