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>
Nguyễn Thái Ngọc Duy committed
Aug 4, 2018 at 08:25 UTC
8578037bedd0d50d679b4369a8dc789219720cf8
1 file changed
+34
-34
Documentation/config.txt
+34
-34
@@ -974,23 +974,28 @@ apply.whitespace::
974
Tells 'git apply' how to handle whitespaces, in the same way
975
as the `--whitespace` option. See linkgit:git-apply[1].
976
977
-blame.showRoot::
978
- Do not treat root commits as boundaries in linkgit:git-blame[1].
979
- This option defaults to false.
980
-
977
blame.blankBoundary::
978
Show blank commit object name for boundary commits in
979
linkgit:git-blame[1]. This option defaults to false.
980
985
-blame.showEmail::
986
- Show the author email instead of author name in linkgit:git-blame[1].
987
- This option defaults to false.
981
+blame.coloring::
982
+ This determines the coloring scheme to be applied to blame
983
+ output. It can be 'repeatedLines', 'highlightRecent',
984
+ or 'none' which is the default.
985
986
blame.date::
987
Specifies the format used to output dates in linkgit:git-blame[1].
988
If unset the iso format is used. For supported values,
989
see the discussion of the `--date` option at linkgit:git-log[1].
990
991
+blame.showEmail::
992
+ Show the author email instead of author name in linkgit:git-blame[1].
993
+ This option defaults to false.
994
+
995
+blame.showRoot::
996
+ Do not treat root commits as boundaries in linkgit:git-blame[1].
997
+ This option defaults to false.
998
+
999
branch.autoSetupMerge::
1000
Tells 'git branch' and 'git checkout' to set up new branches
1001
so that linkgit:git-pull[1] will appropriately merge from the
@@ -1112,6 +1117,28 @@ color.advice::
1117
color.advice.hint::
1118
Use customized color for hints.
1119
1120
+color.blame.highlightRecent::
1121
+ This can be used to color the metadata of a blame line depending
1122
+ on age of the line.
1123
++
1124
+This setting should be set to a comma-separated list of color and date settings,
1125
+starting and ending with a color, the dates should be set from oldest to newest.
1126
+The metadata will be colored given the colors if the the line was introduced
1127
+before the given timestamp, overwriting older timestamped colors.
1128
++
1129
+Instead of an absolute timestamp relative timestamps work as well, e.g.
1130
+2.weeks.ago is valid to address anything older than 2 weeks.
1131
++
1132
+It defaults to 'blue,12 month ago,white,1 month ago,red', which colors
1133
+everything older than one year blue, recent changes between one month and
1134
+one year old are kept white, and lines introduced within the last month are
1135
+colored red.
1136
+
1137
+color.blame.repeatedLines::
1138
+ Use the customized color for the part of git-blame output that
1139
+ is repeated meta information per line (such as commit id,
1140
+ author name, date and timezone). Defaults to cyan.
1141
+
1142
color.branch::
1143
A boolean to enable/disable color in the output of
1144
linkgit:git-branch[1]. May be set to `always`,
@@ -1251,33 +1278,6 @@ color.status.<slot>::
1278
status short-format), or
1279
`unmerged` (files which have unmerged changes).
1280
1254
-color.blame.repeatedLines::
1255
- Use the customized color for the part of git-blame output that
1256
- is repeated meta information per line (such as commit id,
1257
- author name, date and timezone). Defaults to cyan.
1258
-
1259
-color.blame.highlightRecent::
1260
- This can be used to color the metadata of a blame line depending
1261
- on age of the line.
1262
-+
1263
-This setting should be set to a comma-separated list of color and date settings,
1264
-starting and ending with a color, the dates should be set from oldest to newest.
1265
-The metadata will be colored given the colors if the the line was introduced
1266
-before the given timestamp, overwriting older timestamped colors.
1267
-+
1268
-Instead of an absolute timestamp relative timestamps work as well, e.g.
1269
-2.weeks.ago is valid to address anything older than 2 weeks.
1270
-+
1271
-It defaults to 'blue,12 month ago,white,1 month ago,red', which colors
1272
-everything older than one year blue, recent changes between one month and
1273
-one year old are kept white, and lines introduced within the last month are
1274
-colored red.
1275
-
1276
-blame.coloring::
1277
- This determines the coloring scheme to be applied to blame
1278
- output. It can be 'repeatedLines', 'highlightRecent',
1279
- or 'none' which is the default.
1280
-
1281
color.transport::
1282
A boolean to enable/disable color when pushes are rejected. May be
1283
set to `always`, `false` (or `never`) or `auto` (or `true`), in which