From 5c97558c9a813a0a775c438a79cfc438def00c22 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 19 May 2005 03:32:35 -0700 Subject: [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 --- Documentation/git-diff-cache.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Documentation/git-diff-cache.txt') diff --git a/Documentation/git-diff-cache.txt b/Documentation/git-diff-cache.txt index b54b8226ad..9cd6103334 100644 --- a/Documentation/git-diff-cache.txt +++ b/Documentation/git-diff-cache.txt @@ -9,7 +9,7 @@ git-diff-cache - Compares content and mode of blobs between the cache and reposi SYNOPSIS -------- -'git-diff-cache' [-p] [-r] [-z] [-m] [--cached] +'git-diff-cache' [-p] [-r] [-z] [-m] [-M] [--cached] DESCRIPTION ----------- @@ -33,6 +33,9 @@ OPTIONS -z:: \0 line termination on output +-M:: + Detect renames; implies -p. + --cached:: do not consider the on-disk file at all -- cgit v1.3-5-g9baa