summaryrefslogtreecommitdiff
path: root/Documentation/git-diff-cache.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-19 10:32:35 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-19 15:59:40 (GMT)
commit5c97558c9a813a0a775c438a79cfc438def00c22 (patch)
tree59b9eaa38cd2ec6f846ed2f2b6767055022a227a /Documentation/git-diff-cache.txt
parenta310d4349467d78266f38d29e500c77b96ee5bef (diff)
downloadgit-5c97558c9a813a0a775c438a79cfc438def00c22.zip
git-5c97558c9a813a0a775c438a79cfc438def00c22.tar.gz
git-5c97558c9a813a0a775c438a79cfc438def00c22.tar.bz2
[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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/git-diff-cache.txt')
-rw-r--r--Documentation/git-diff-cache.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-diff-cache.txt b/Documentation/git-diff-cache.txt
index b54b822..9cd6103 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] <tree-ish>
+'git-diff-cache' [-p] [-r] [-z] [-m] [-M] [--cached] <tree-ish>
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