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

1  2 
blame.c
builtin/am.c
builtin/commit.c
cache.h
config.c
log-tree.c
sequencer.c
diff --cc blame.c
Simple merge
diff --cc builtin/am.c
Simple merge
Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge
diff --cc log-tree.c
Simple merge
diff --cc sequencer.c
Simple merge