mirror of
https://github.com/git/git.git
synced 2024-05-08 16:46:35 +02:00
8934ac8c92
When ignoring commits, the commit that is blamed might not be responsible for the change, due to the inaccuracy of our heuristic. Users might want to know when a particular line has a potentially inaccurate blame. Furthermore, guess_line_blames() may fail to find any parent commit for a given line touched by an ignored commit. Those 'unblamable' lines remain blamed on an ignored commit. Users might want to know if a line is unblamable so that they do not spend time investigating a commit they know is uninteresting. This patch adds two config options to mark these two types of lines in the output of blame. The first option can identify ignored lines by specifying blame.markIgnoredLines. When this option is set, each blame line that was blamed on a commit other than the ignored commit is marked with a '?'. For example: 278b6158d6fdb (Barret Rhoden 2016-04-11 13:57:54 -0400 26) appears as: ?278b6158d6fd (Barret Rhoden 2016-04-11 13:57:54 -0400 26) where the '?' is placed before the commit, and the hash has one fewer characters. Sometimes we are unable to even guess at what ancestor commit touched a line. These lines are 'unblamable.' The second option, blame.markUnblamableLines, will mark the line with '*'. For example, say we ignore e5e8d36d04cbe, yet we are unable to blame this line on another commit: e5e8d36d04cbe (Barret Rhoden 2016-04-11 13:57:54 -0400 26) appears as: *e5e8d36d04cb (Barret Rhoden 2016-04-11 13:57:54 -0400 26) When these config options are used together, every line touched by an ignored commit will be marked with either a '?' or a '*'. Signed-off-by: Barret Rhoden <brho@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
38 lines
1.4 KiB
Plaintext
38 lines
1.4 KiB
Plaintext
blame.blankBoundary::
|
|
Show blank commit object name for boundary commits in
|
|
linkgit:git-blame[1]. This option defaults to false.
|
|
|
|
blame.coloring::
|
|
This determines the coloring scheme to be applied to blame
|
|
output. It can be 'repeatedLines', 'highlightRecent',
|
|
or 'none' which is the default.
|
|
|
|
blame.date::
|
|
Specifies the format used to output dates in linkgit:git-blame[1].
|
|
If unset the iso format is used. For supported values,
|
|
see the discussion of the `--date` option at linkgit:git-log[1].
|
|
|
|
blame.showEmail::
|
|
Show the author email instead of author name in linkgit:git-blame[1].
|
|
This option defaults to false.
|
|
|
|
blame.showRoot::
|
|
Do not treat root commits as boundaries in linkgit:git-blame[1].
|
|
This option defaults to false.
|
|
|
|
blame.ignoreRevsFile::
|
|
Ignore revisions listed in the file, one unabbreviated object name per
|
|
line, in linkgit:git-blame[1]. Whitespace and comments beginning with
|
|
`#` are ignored. This option may be repeated multiple times. Empty
|
|
file names will reset the list of ignored revisions. This option will
|
|
be handled before the command line option `--ignore-revs-file`.
|
|
|
|
blame.markUnblamables::
|
|
Mark lines that were changed by an ignored revision that we could not
|
|
attribute to another commit with a '*' in the output of
|
|
linkgit:git-blame[1].
|
|
|
|
blame.markIgnoredLines::
|
|
Mark lines that were changed by an ignored revision that we attributed to
|
|
another commit with a '?' in the output of linkgit:git-blame[1].
|