aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-21 12:09:42 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-21 12:14:19 -0700
commite5dce96e9e26f8e30291c79fa5647313c64b2150 (patch)
tree6d97672b00d1778df96c99b962be6396b532407f
parentbafc478f1618534fcb85bedc0fa224bd2d462441 (diff)
downloadgit-e5dce96e9e26f8e30291c79fa5647313c64b2150.tar.gz
git-e5dce96e9e26f8e30291c79fa5647313c64b2150.tar.xz
git blame: document that it always follows origin across whole-file renames
Make it clear to people who (rightly or wrongly) think that the "--follow" option should follow origin across while-file renames that we already do so. That would explain the output that they see when they do give the "--follow" option to the command. We may or may not want to do a "--no-follow" patch as a follow-up, but that is a separate topic. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-blame.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 7ee923629..e44173f66 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -20,6 +20,12 @@ last modified the line. Optionally, start annotating from the given revision.
The command can also limit the range of lines annotated.
+The origin of lines is automatically followed across whole-file
+renames (currently there is no option to turn the rename-following
+off). To follow lines moved from one file to another, or to follow
+lines that were copied and pasted from another file, etc., see the
+`-C` and `-M` options.
+
The report does not tell you anything about lines which have been deleted or
replaced; you need to use a tool such as 'git diff' or the "pickaxe"
interface briefly mentioned in the following paragraph.