# [PATCH] config.txt: reorder blame stuff to keep config keys sorted 3 messages from 2018-08-04 to 2018-08-06. Participants: Nguyễn Thái Ngọc Duy, Stefan Beller, Duy Nguyen. Thread: https://gitlist.dev/t/49032 ## Nguyễn Thái Ngọc Duy, 2018-08-04 06:25 Subject: [PATCH] config.txt: reorder blame stuff to keep config keys sorted Message-ID: <20180804062500.20188-1-pclouds@gmail.com> URL: https://gitlist.dev/e/20180804062500.20188-1-pclouds%40gmail.com ``` 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 --- Documentation/config.txt | 68 ++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index fd8d27e761..d97455057c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -995,23 +995,28 @@ apply.whitespace:: Tells 'git apply' how to handle whitespaces, in the same way 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:: Show blank commit object name for boundary commits in linkgit:git-blame[1]. This option defaults to false. -blame.showEmail:: - Show the author email instead of author name 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. + branch.autoSetupMerge:: Tells 'git branch' and 'git checkout' to set up new branches so that linkgit:git-pull[1] will appropriately merge from the @@ -1149,6 +1154,28 @@ color.advice:: color.advice.hint:: 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:: A boolean to enable/disable color in the output of linkgit:git-branch[1]. May be set to `always`, @@ -1296,33 +1323,6 @@ color.status.:: status short-format), or `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:: A boolean to enable/disable color when pushes are rejected. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which -- 2.18.0.759.gbd3bccdecd ``` ## Stefan Beller, 2018-08-06 05:59 Subject: Re: [PATCH] config.txt: reorder blame stuff to keep config keys sorted Message-ID: URL: https://gitlist.dev/e/CAGZ79kbS7K0yUak9g5vH5ZyJ2aZ4RBmbBXHVtBzQjfRG4Fx1jg%40mail.gmail.com In-Reply-To: <20180804062500.20188-1-pclouds@gmail.com> ``` On Fri, Aug 3, 2018 at 11:25 PM Nguyễn Thái Ngọc Duy wrote: > > 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 FWIW: Acked-by: Stefan Beller Are there more hidden sorts in the config.txt that I am not aware of? Thanks for writing this patch! Stefan ``` ## Duy Nguyen, 2018-08-06 15:35 Subject: Re: [PATCH] config.txt: reorder blame stuff to keep config keys sorted Message-ID: URL: https://gitlist.dev/e/CACsJy8DE%3DWCBrHZ-GH1%2BiCa%2Byn6QcKYzMmNW29-DwxKNo%3Dgo%3DA%40mail.gmail.com In-Reply-To: ``` On Mon, Aug 6, 2018 at 7:59 AM Stefan Beller wrote: > > On Fri, Aug 3, 2018 at 11:25 PM Nguyễn Thái Ngọc Duy wrote: > > > > 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 > > FWIW: > Acked-by: Stefan Beller > > Are there more hidden sorts in the config.txt that I am not aware of? I think it's "mostly sorted" now. It's easier to see when you do git grep '::$' Documentation/config.txt -- Duy ```