config.txt: reorder blame stuff to keep config keys sorted

The color group in config.txt is actually sorted but changes in
sb/blame-color broke this. Reorder color.blame.* and move
blame.coloring back to the rest of blame.* (and reorder that group too
while we're there)

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2018-08-04 08:25:00 +02:00 коммит произвёл Junio C Hamano
Родитель 53f9a3e157
Коммит 8578037bed
1 изменённых файлов: 34 добавлений и 34 удалений

Просмотреть файл

@ -974,23 +974,28 @@ apply.whitespace::
Tells 'git apply' how to handle whitespaces, in the same way Tells 'git apply' how to handle whitespaces, in the same way
as the `--whitespace` option. See linkgit:git-apply[1]. as the `--whitespace` option. See linkgit:git-apply[1].
blame.showRoot::
Do not treat root commits as boundaries in linkgit:git-blame[1].
This option defaults to false.
blame.blankBoundary:: blame.blankBoundary::
Show blank commit object name for boundary commits in Show blank commit object name for boundary commits in
linkgit:git-blame[1]. This option defaults to false. linkgit:git-blame[1]. This option defaults to false.
blame.showEmail:: blame.coloring::
Show the author email instead of author name in linkgit:git-blame[1]. This determines the coloring scheme to be applied to blame
This option defaults to false. output. It can be 'repeatedLines', 'highlightRecent',
or 'none' which is the default.
blame.date:: blame.date::
Specifies the format used to output dates in linkgit:git-blame[1]. Specifies the format used to output dates in linkgit:git-blame[1].
If unset the iso format is used. For supported values, If unset the iso format is used. For supported values,
see the discussion of the `--date` option at linkgit:git-log[1]. 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.
branch.autoSetupMerge:: branch.autoSetupMerge::
Tells 'git branch' and 'git checkout' to set up new branches Tells 'git branch' and 'git checkout' to set up new branches
so that linkgit:git-pull[1] will appropriately merge from the so that linkgit:git-pull[1] will appropriately merge from the
@ -1112,6 +1117,28 @@ color.advice::
color.advice.hint:: color.advice.hint::
Use customized color for hints. Use customized color for hints.
color.blame.highlightRecent::
This can be used to color the metadata of a blame line depending
on age of the line.
+
This setting should be set to a comma-separated list of color and date settings,
starting and ending with a color, the dates should be set from oldest to newest.
The metadata will be colored given the colors if the the line was introduced
before the given timestamp, overwriting older timestamped colors.
+
Instead of an absolute timestamp relative timestamps work as well, e.g.
2.weeks.ago is valid to address anything older than 2 weeks.
+
It defaults to 'blue,12 month ago,white,1 month ago,red', which colors
everything older than one year blue, recent changes between one month and
one year old are kept white, and lines introduced within the last month are
colored red.
color.blame.repeatedLines::
Use the customized color for the part of git-blame output that
is repeated meta information per line (such as commit id,
author name, date and timezone). Defaults to cyan.
color.branch:: color.branch::
A boolean to enable/disable color in the output of A boolean to enable/disable color in the output of
linkgit:git-branch[1]. May be set to `always`, linkgit:git-branch[1]. May be set to `always`,
@ -1251,33 +1278,6 @@ color.status.<slot>::
status short-format), or status short-format), or
`unmerged` (files which have unmerged changes). `unmerged` (files which have unmerged changes).
color.blame.repeatedLines::
Use the customized color for the part of git-blame output that
is repeated meta information per line (such as commit id,
author name, date and timezone). Defaults to cyan.
color.blame.highlightRecent::
This can be used to color the metadata of a blame line depending
on age of the line.
+
This setting should be set to a comma-separated list of color and date settings,
starting and ending with a color, the dates should be set from oldest to newest.
The metadata will be colored given the colors if the the line was introduced
before the given timestamp, overwriting older timestamped colors.
+
Instead of an absolute timestamp relative timestamps work as well, e.g.
2.weeks.ago is valid to address anything older than 2 weeks.
+
It defaults to 'blue,12 month ago,white,1 month ago,red', which colors
everything older than one year blue, recent changes between one month and
one year old are kept white, and lines introduced within the last month are
colored red.
blame.coloring::
This determines the coloring scheme to be applied to blame
output. It can be 'repeatedLines', 'highlightRecent',
or 'none' which is the default.
color.transport:: color.transport::
A boolean to enable/disable color when pushes are rejected. May be A boolean to enable/disable color when pushes are rejected. May be
set to `always`, `false` (or `never`) or `auto` (or `true`), in which set to `always`, `false` (or `never`) or `auto` (or `true`), in which