diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-05-02 20:13:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-05-02 20:13:35 +0300 |
| commit | cf85f4b3bd34469b75b7453f9de0315534406a41 (patch) | |
| tree | b92786b3c95ede0abb7c77ef98f9e8fa7e3beca7 /Documentation | |
| parent | f357d46adacb8d7f2c465a00c66a57d925396bfe (diff) | |
| parent | 603d0fdce2ca84d4dc7b26e46430778fe9c4cb72 (diff) | |
Merge branch 'jk/blame-fake-commit-label'
The output given by "git blame" that attributes a line to contents
taken from the file specified by the "--contents" option shows it
differently from a line attributed to the working tree file.
* jk/blame-fake-commit-label:
blame: use different author name for fake commit generated by --contents
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/blame-options.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt index 95599bd6e5..552dcc60f2 100644 --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.txt @@ -64,11 +64,9 @@ include::line-range-format.txt[] manual page. --contents <file>:: - Pretend the file being annotated has a commit with the - contents from the named file and a parent of <rev>, - defaulting to HEAD when no <rev> is specified. You may - specify '-' to make the command read from the standard - input for the file contents. + Annotate using the contents from the named file, starting from <rev> + if it is specified, and HEAD otherwise. You may specify '-' to make + the command read from the standard input for the file contents. --date <format>:: Specifies the format used to output dates. If --date is not |