Merge branch 'wh/author-committer-ident-config'
commit4e021dc28e71f9d820f7cf18567d9a86df326753
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Mar 2019 00:59:53 +0000 (7 09:59 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Mar 2019 00:59:53 +0000 (7 09:59 +0900)
tree7d3b0cf7a0da8c1ad7d77fcf72b9ecbe5dd1319e
parent42977bf5c7306e4c2dded5353f39cf087cf23a1f
parent39ab4d0951ba64edcfae7809740715991b44fa6d
Merge branch 'wh/author-committer-ident-config'

Four new configuration variables {author,committer}.{name,email}
have been introduced to override user.{name,email} in more specific
cases.

* wh/author-committer-ident-config:
  config: allow giving separate author and committer idents
blame.c
builtin/am.c
builtin/commit.c
cache.h
config.c
log-tree.c
sequencer.c