Merge branch 'sb/blame-config-doc' into maint
commit4a1ddb561cad07277be60a6e04513da5eb9db582
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:04:59 +0000 (15 12:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:04:59 +0000 (15 12:04 +0900)
treea2e3caf186fc954ab99d36a57e331f47dfc2523c
parentea3321992b280bb0b8ea781a62e9194ba93ebde0
parentde0bc11d138e95f3b59db8f6739afb4ce0ce58e0
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
Documentation/config.txt