From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Nov 2017 03:04:59 +0000 (+0900)
Subject: Merge branch 'sb/blame-config-doc' into maint
X-Git-Tag: v2.15.1~29
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4a1ddb561cad07277be60a6e04513da5eb9db582?ds=inline;hp=-c

Merge branch 'sb/blame-config-doc' into maint

Description of blame.{showroot,blankboundary,showemail,date}
configuration variables have been added to "git config --help".

* sb/blame-config-doc:
config: document blame configuration
---

4a1ddb561cad07277be60a6e04513da5eb9db582
diff --combined Documentation/config.txt
index 1ac0ae6adb,2102f070d4..9593bfabaa
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -776,12 -776,6 +776,12 @@@ core.commentChar:
  If set to "auto", `git-commit` would select a character that is not
  the beginning character of any line in existing commit messages.
  
 +core.filesRefLockTimeout::
 +	The length of time, in milliseconds, to retry when trying to
 +	lock an individual reference. Value 0 means not to retry at
 +	all; -1 means to try indefinitely. Default is 100 (i.e.,
 +	retry for 100ms).
 +
  core.packedRefsTimeout::
  	The length of time, in milliseconds, to retry when trying to
  	lock the `packed-refs` file. Value 0 means not to retry at
@@@ -949,6 -943,23 +949,23 @@@ 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.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].
+ 
  branch.autoSetupMerge::
  	Tells 'git branch' and 'git checkout' to set up new branches
  	so that linkgit:git-pull[1] will appropriately merge from the
@@@ -1083,25 -1094,14 +1100,25 @@@ This does not affect linkgit:git-format
  'git-diff-{asterisk}' plumbing commands.  Can be overridden on the
  command line with the `--color[=<when>]` option.
  
 +diff.colorMoved::
 +	If set to either a valid `<mode>` or a true value, moved lines
 +	in a diff are colored differently, for details of valid modes
 +	see '--color-moved' in linkgit:git-diff[1]. If simply set to
 +	true the default color mode will be used. When set to false,
 +	moved lines are not colored.
 +
  color.diff.<slot>::
  	Use customized color for diff colorization.  `<slot>` specifies
  	which part of the patch to use the specified color, and is one
  	of `context` (context text - `plain` is a historical synonym),
  	`meta` (metainformation), `frag`
  	(hunk header), 'func' (function in hunk header), `old` (removed lines),
 -	`new` (added lines), `commit` (commit headers), or `whitespace`
 -	(highlighting whitespace errors).
 +	`new` (added lines), `commit` (commit headers), `whitespace`
 +	(highlighting whitespace errors), `oldMoved` (deleted lines),
 +	`newMoved` (added lines), `oldMovedDimmed`, `oldMovedAlternative`,
 +	`oldMovedAlternativeDimmed`, `newMovedDimmed`, `newMovedAlternative`
 +	and `newMovedAlternativeDimmed` (See the '<mode>'
 +	setting of '--color-moved' in linkgit:git-diff[1] for details).
  
  color.decorate.<slot>::
  	Use customized color for 'git log --decorate' output.  `<slot>` is one
@@@ -1570,13 -1570,11 +1587,13 @@@ gc.<pattern>.reflogExpireUnreachable:
  gc.rerereResolved::
  	Records of conflicted merge you resolved earlier are
  	kept for this many days when 'git rerere gc' is run.
 +	You can also use more human-readable "1.month.ago", etc.
  	The default is 60 days.  See linkgit:git-rerere[1].
  
  gc.rerereUnresolved::
  	Records of conflicted merge you have not resolved are
  	kept for this many days when 'git rerere gc' is run.
 +	You can also use more human-readable "1.month.ago", etc.
  	The default is 15 days.  See linkgit:git-rerere[1].
  
  gitcvs.commitMsgAnnotation::
@@@ -3085,14 -3083,10 +3102,14 @@@ submodule.<name>.url:
  	See linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
  
  submodule.<name>.update::
 -	The default update procedure for a submodule. This variable
 -	is populated by `git submodule init` from the
 -	linkgit:gitmodules[5] file. See description of 'update'
 -	command in linkgit:git-submodule[1].
 +	The method by which a submodule is updated by 'git submodule update',
 +	which is the only affected command, others such as
 +	'git checkout --recurse-submodules' are unaffected. It exists for
 +	historical reasons, when 'git submodule' was the only command to
 +	interact with submodules; settings like `submodule.active`
 +	and `pull.rebase` are more specific. It is populated by
 +	`git submodule init` from the linkgit:gitmodules[5] file.
 +	See description of 'update' command in linkgit:git-submodule[1].
  
  submodule.<name>.branch::
  	The remote branch name for a submodule, used by `git submodule