summaryrefslogtreecommitdiff
path: root/Documentation/diffcore.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-19 20:14:53 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-20 03:13:18 (GMT)
commit232b75ab3d60475b19270be022a966772c25c84b (patch)
tree399cf4604d7737ec89fa646b8aff6c65d3409dcd /Documentation/diffcore.txt
parent4727f640036fbdad414bdcbe31d08f6a8fd70923 (diff)
downloadgit-232b75ab3d60475b19270be022a966772c25c84b.zip
git-232b75ab3d60475b19270be022a966772c25c84b.tar.gz
git-232b75ab3d60475b19270be022a966772c25c84b.tar.bz2
[PATCH] Update diff documentation.
This updates diff documentation to discuss --find-copies-harder, and adds descriptions for options that were not described earlier. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/diffcore.txt')
-rw-r--r--Documentation/diffcore.txt16
1 files changed, 7 insertions, 9 deletions
diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt
index 45620f8..7627453 100644
--- a/Documentation/diffcore.txt
+++ b/Documentation/diffcore.txt
@@ -150,15 +150,13 @@ similarity score different from the default 50% by giving a
number after "-M" or "-C" option (e.g. "-M8" to tell it to use
8/10 = 80%).
-Note. When the "-C" option is used, git-diff-cache and
-git-diff-file commands feed not just modified filepairs but
-unmodified ones to diffcore mechanism as well. This lets the
-copy detector consider unmodified files as copy source
-candidates at the expense of making it slower. Currently
-git-diff-tree does not feed unmodified filepairs even when the
-"-C" option is used, so it can detect copies only if the file
-that was copied happened to have been modified in the same
-changeset.
+Note. When the "-C" option is used with --find-copies-harder
+option, git-diff-* commands feed unmodified filepairs to
+diffcore mechanism as well as modified ones. This lets the copy
+detector consider unmodified files as copy source candidates at
+the expense of making it slower. Without --find-copies-harder,
+git-diff-* commands can detect copies only if the file that was
+copied happened to have been modified in the same changeset.
diffcore-merge-broken