{"thread":{"id":"49032","subject":"[PATCH] config.txt: reorder blame stuff to keep config keys sorted","startedAt":"2018-08-04T06:31:04Z","lastAt":"2018-08-06T15:36:25Z","messageCount":3,"participants":["Nguyễn Thái Ngọc Duy","Stefan Beller","Duy Nguyen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"354481","messageId":"20180804062500.20188-1-pclouds@gmail.com","threadId":"49032","inReplyTo":null,"subject":"[PATCH] config.txt: reorder blame stuff to keep config keys sorted","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2018-08-04T06:25:00Z","receivedAt":"2018-08-04T06:31:04Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"The color group in config.txt is actually sorted but changes in\nsb/blame-color broke this. Reorder color.blame.* and move\nblame.coloring back to the rest of blame.* (and reorder that group too\nwhile we're there)\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n Documentation/config.txt | 68 ++++++++++++++++++++--------------------\n 1 file changed, 34 insertions(+), 34 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex fd8d27e761..d97455057c 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -995,23 +995,28 @@ apply.whitespace::\n \tTells 'git apply' how to handle whitespaces, in the same way\n \tas the `--whitespace` option. See linkgit:git-apply[1].\n \n-blame.showRoot::\n-\tDo not treat root commits as boundaries in linkgit:git-blame[1].\n-\tThis option defaults to false.\n-\n blame.blankBoundary::\n \tShow blank commit object name for boundary commits in\n \tlinkgit:git-blame[1]. This option defaults to false.\n \n-blame.showEmail::\n-\tShow the author email instead of author name in linkgit:git-blame[1].\n-\tThis option defaults to false.\n+blame.coloring::\n+\tThis determines the coloring scheme to be applied to blame\n+\toutput. It can be 'repeatedLines', 'highlightRecent',\n+\tor 'none' which is the default.\n \n blame.date::\n \tSpecifies the format used to output dates in linkgit:git-blame[1].\n \tIf unset the iso format is used. For supported values,\n \tsee the discussion of the `--date` option at linkgit:git-log[1].\n \n+blame.showEmail::\n+\tShow the author email instead of author name in linkgit:git-blame[1].\n+\tThis option defaults to false.\n+\n+blame.showRoot::\n+\tDo not treat root commits as boundaries in linkgit:git-blame[1].\n+\tThis option defaults to false.\n+\n branch.autoSetupMerge::\n \tTells 'git branch' and 'git checkout' to set up new branches\n \tso that linkgit:git-pull[1] will appropriately merge from the\n@@ -1149,6 +1154,28 @@ color.advice::\n color.advice.hint::\n \tUse customized color for hints.\n \n+color.blame.highlightRecent::\n+\tThis can be used to color the metadata of a blame line depending\n+\ton age of the line.\n++\n+This setting should be set to a comma-separated list of color and date settings,\n+starting and ending with a color, the dates should be set from oldest to newest.\n+The metadata will be colored given the colors if the the line was introduced\n+before the given timestamp, overwriting older timestamped colors.\n++\n+Instead of an absolute timestamp relative timestamps work as well, e.g.\n+2.weeks.ago is valid to address anything older than 2 weeks.\n++\n+It defaults to 'blue,12 month ago,white,1 month ago,red', which colors\n+everything older than one year blue, recent changes between one month and\n+one year old are kept white, and lines introduced within the last month are\n+colored red.\n+\n+color.blame.repeatedLines::\n+\tUse the customized color for the part of git-blame output that\n+\tis repeated meta information per line (such as commit id,\n+\tauthor name, date and timezone). Defaults to cyan.\n+\n color.branch::\n \tA boolean to enable/disable color in the output of\n \tlinkgit:git-branch[1]. May be set to `always`,\n@@ -1296,33 +1323,6 @@ color.status.::\n \tstatus short-format), or\n \t`unmerged` (files which have unmerged changes).\n \n-color.blame.repeatedLines::\n-\tUse the customized color for the part of git-blame output that\n-\tis repeated meta information per line (such as commit id,\n-\tauthor name, date and timezone). Defaults to cyan.\n-\n-color.blame.highlightRecent::\n-\tThis can be used to color the metadata of a blame line depending\n-\ton age of the line.\n-+\n-This setting should be set to a comma-separated list of color and date settings,\n-starting and ending with a color, the dates should be set from oldest to newest.\n-The metadata will be colored given the colors if the the line was introduced\n-before the given timestamp, overwriting older timestamped colors.\n-+\n-Instead of an absolute timestamp relative timestamps work as well, e.g.\n-2.weeks.ago is valid to address anything older than 2 weeks.\n-+\n-It defaults to 'blue,12 month ago,white,1 month ago,red', which colors\n-everything older than one year blue, recent changes between one month and\n-one year old are kept white, and lines introduced within the last month are\n-colored red.\n-\n-blame.coloring::\n-\tThis determines the coloring scheme to be applied to blame\n-\toutput. It can be 'repeatedLines', 'highlightRecent',\n-\tor 'none' which is the default.\n-\n color.transport::\n \tA boolean to enable/disable color when pushes are rejected. May be\n \tset to `always`, `false` (or `never`) or `auto` (or `true`), in which\n-- \n2.18.0.759.gbd3bccdecd\n\n"},{"id":"354582","messageId":"CAGZ79kbS7K0yUak9g5vH5ZyJ2aZ4RBmbBXHVtBzQjfRG4Fx1jg@mail.gmail.com","threadId":"49032","inReplyTo":"20180804062500.20188-1-pclouds@gmail.com","subject":"Re: [PATCH] config.txt: reorder blame stuff to keep config keys sorted","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-08-06T05:59:14Z","receivedAt":"2018-08-06T05:59:28Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Fri, Aug 3, 2018 at 11:25 PM Nguyễn Thái Ngọc Duy wrote:\n>\n> The color group in config.txt is actually sorted but changes in\n> sb/blame-color broke this. Reorder color.blame.* and move\n> blame.coloring back to the rest of blame.* (and reorder that group too\n> while we're there)\n>\n> Signed-off-by: Nguyễn Thái Ngọc Duy \n\nFWIW:\nAcked-by: Stefan Beller \n\nAre there more hidden sorts in the config.txt that I am not aware of?\n\nThanks for writing this patch!\nStefan\n"},{"id":"354627","messageId":"CACsJy8DE=WCBrHZ-GH1+iCa+yn6QcKYzMmNW29-DwxKNo=go=A@mail.gmail.com","threadId":"49032","inReplyTo":"CAGZ79kbS7K0yUak9g5vH5ZyJ2aZ4RBmbBXHVtBzQjfRG4Fx1jg@mail.gmail.com","subject":"Re: [PATCH] config.txt: reorder blame stuff to keep config keys sorted","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2018-08-06T15:35:57Z","receivedAt":"2018-08-06T15:36:25Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Mon, Aug 6, 2018 at 7:59 AM Stefan Beller wrote:\n>\n> On Fri, Aug 3, 2018 at 11:25 PM Nguyễn Thái Ngọc Duy wrote:\n> >\n> > The color group in config.txt is actually sorted but changes in\n> > sb/blame-color broke this. Reorder color.blame.* and move\n> > blame.coloring back to the rest of blame.* (and reorder that group too\n> > while we're there)\n> >\n> > Signed-off-by: Nguyễn Thái Ngọc Duy \n>\n> FWIW:\n> Acked-by: Stefan Beller \n>\n> Are there more hidden sorts in the config.txt that I am not aware of?\n\nI think it's \"mostly sorted\" now. It's easier to see when you do\n\n git grep '::$' Documentation/config.txt\n-- \nDuy\n"}]}