diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-08 11:33:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-08 11:33:35 -0700 |
| commit | 63c0c2c8a0be285be5c3dec6191540d60489b8a0 (patch) | |
| tree | 5860fb40d68eafad0603fc54067a759d651ee802 | |
| parent | 6e2035715e35988917a88b14da3bbbce8351d920 (diff) | |
| parent | e5dce96e9e26f8e30291c79fa5647313c64b2150 (diff) | |
| download | git-63c0c2c8a0be285be5c3dec6191540d60489b8a0.tar.gz git-63c0c2c8a0be285be5c3dec6191540d60489b8a0.tar.xz | |
Merge branch 'jc/blame-follows-renames' into maint
It was unclear in the documentation for "git blame" that it is
unnecessary for users to use the "--follow" option.
* jc/blame-follows-renames:
git blame: document that it always follows origin across whole-file renames
| -rw-r--r-- | Documentation/git-blame.txt | 6 |
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. |