Merge branch 'sb/blame-config-doc'
Description of blame.{showroot,blankboundary,showemail,date} configuration variables have been added to "git config --help". * sb/blame-config-doc: config: document blame configuration
This commit is contained in:
commit
4da9f598e6
@ -952,6 +952,23 @@ apply.whitespace::
|
|||||||
Tells 'git apply' how to handle whitespaces, in the same way
|
Tells 'git apply' how to handle whitespaces, in the same way
|
||||||
as the `--whitespace` option. See linkgit:git-apply[1].
|
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::
|
branch.autoSetupMerge::
|
||||||
Tells 'git branch' and 'git checkout' to set up new branches
|
Tells 'git branch' and 'git checkout' to set up new branches
|
||||||
so that linkgit:git-pull[1] will appropriately merge from the
|
so that linkgit:git-pull[1] will appropriately merge from the
|
||||||
|
Loading…
Reference in New Issue
Block a user