git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] config.txt: reorder blame stuff to keep config keys sorted
@ 2018-08-04  6:25 Nguyễn Thái Ngọc Duy
  2018-08-06  5:59 ` Stefan Beller
  0 siblings, 1 reply; 3+ messages in thread
From: Nguyễn Thái Ngọc Duy @ 2018-08-04  6:25 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano, Stefan Beller, Nguyễn Thái Ngọc Duy

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>
---
 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.<slot>::
 	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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] config.txt: reorder blame stuff to keep config keys sorted
  2018-08-04  6:25 [PATCH] config.txt: reorder blame stuff to keep config keys sorted Nguyễn Thái Ngọc Duy
@ 2018-08-06  5:59 ` Stefan Beller
  2018-08-06 15:35   ` Duy Nguyen
  0 siblings, 1 reply; 3+ messages in thread
From: Stefan Beller @ 2018-08-06  5:59 UTC (permalink / raw)
  To: Duy Nguyen; +Cc: git, Junio C Hamano

On Fri, Aug 3, 2018 at 11:25 PM Nguyễn Thái Ngọc Duy <pclouds@gmail.com> 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 <pclouds@gmail.com>

FWIW:
Acked-by: Stefan Beller <sbeller@google.com>

Are there more hidden sorts in the config.txt that I am not aware of?

Thanks for writing this patch!
Stefan

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] config.txt: reorder blame stuff to keep config keys sorted
  2018-08-06  5:59 ` Stefan Beller
@ 2018-08-06 15:35   ` Duy Nguyen
  0 siblings, 0 replies; 3+ messages in thread
From: Duy Nguyen @ 2018-08-06 15:35 UTC (permalink / raw)
  To: Stefan Beller; +Cc: Git Mailing List, Junio C Hamano

On Mon, Aug 6, 2018 at 7:59 AM Stefan Beller <sbeller@google.com> wrote:
>
> On Fri, Aug 3, 2018 at 11:25 PM Nguyễn Thái Ngọc Duy <pclouds@gmail.com> 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 <pclouds@gmail.com>
>
> FWIW:
> Acked-by: Stefan Beller <sbeller@google.com>
>
> 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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-08-06 15:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-04  6:25 [PATCH] config.txt: reorder blame stuff to keep config keys sorted Nguyễn Thái Ngọc Duy
2018-08-06  5:59 ` Stefan Beller
2018-08-06 15:35   ` Duy Nguyen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).