diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-18 22:47:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-18 22:47:58 (GMT) |
| commit | 871e42eb0996ff43a11faf47c6c05f869c4bb72c (patch) | |
| tree | 4374c5aeefb3383900dafbb7560a0397e4bcc755 /Documentation/git-blame.txt | |
| parent | a86ed75f32a38d3496fedb2be52816aa36472db1 (diff) | |
| parent | 8c3285613322f5b08c8a2320030f4e74b5032998 (diff) | |
| download | git-871e42eb0996ff43a11faf47c6c05f869c4bb72c.zip git-871e42eb0996ff43a11faf47c6c05f869c4bb72c.tar.gz git-871e42eb0996ff43a11faf47c6c05f869c4bb72c.tar.bz2 | |
Merge branch 'bs/doc-blame-color-lines'
The "--color-lines" and "--color-by-age" options of "git blame"
have been missing, which are now documented.
* bs/doc-blame-color-lines:
blame: document --color-* options
blame: describe default output format
Diffstat (limited to 'Documentation/git-blame.txt')
| -rw-r--r-- | Documentation/git-blame.txt | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index 3bf5d5d..d7a46cc 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -11,8 +11,8 @@ SYNOPSIS 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental] [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>] [--ignore-rev <rev>] [--ignore-revs-file <file>] - [--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>..<rev>] - [--] <file> + [--color-lines] [--color-by-age] [--progress] [--abbrev=<n>] + [<rev> | --contents <file> | --reverse <rev>..<rev>] [--] <file> DESCRIPTION ----------- @@ -93,6 +93,19 @@ include::blame-options.txt[] is used for a caret to mark the boundary commit. +THE DEFAULT FORMAT +------------------ + +When neither `--porcelain` nor `--incremental` option is specified, +`git blame` will output annotation for each line with: + +- abbreviated object name for the commit the line came from; +- author ident (by default author name and date, unless `-s` or `-e` + is specified); and +- line number + +before the line contents. + THE PORCELAIN FORMAT -------------------- |