From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 May 2018 05:04:09 +0000 (+0900)
Subject: Merge branch 'sb/blame-color'
X-Git-Tag: v2.18.0-rc0~18
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3d241297991c6f6ac6b1e50e52a4ae35bc431f28

Merge branch 'sb/blame-color'

"git blame" learns to unhighlight uninteresting metadata from the
originating commit on lines that are the same as the previous one,
and also paint lines in different colors depending on the age of
the commit.

* sb/blame-color:
builtin/blame: add new coloring scheme config
builtin/blame: highlight recently changed lines
builtin/blame: dim uninteresting metadata lines
---

3d241297991c6f6ac6b1e50e52a4ae35bc431f28
diff --cc Documentation/config.txt
index 460c14f047,4eb030ed43..7d8383433c
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1251,15 -1218,33 +1251,42 @@@ 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
 +	case colors are used only when the error output goes to a terminal.
 +	If unset, then the value of `color.ui` is used (`auto` by default).
 +
 +color.transport.rejected::
 +	Use customized color when a push was rejected.
 +
  color.ui::
  	This variable determines the default value for variables such
  	as `color.diff` and `color.grep` that control the use of color