Skip to content

Commit

Permalink
git blame: document that it always follows origin across whole-file r…
Browse files Browse the repository at this point in the history
…enames

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>
  • Loading branch information
Junio C Hamano committed Sep 21, 2012
1 parent bafc478 commit e5dce96
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Documentation/git-blame.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit e5dce96

Please sign in to comment.