From: Junio C Hamano Date: Mon, 1 Oct 2012 19:58:43 +0000 (-0700) Subject: Merge branch 'jc/blame-follows-renames' X-Git-Tag: v1.8.0-rc0~5 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4dbf436bffdf43f91852e23018fc0e45c1bfdab8?hp=03b98d2e78debf163d0dccc98a213dcd4608d7d8 Merge branch 'jc/blame-follows-renames' Clarify the "blame" documentation to tell the users that there is no need to ask for "--follow". * jc/blame-follows-renames: git blame: document that it always follows origin across whole-file renames --- diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index 7ee923629e..e44173f66a 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.