summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-03-07 09:59:53 +0900
committerJunio C Hamano <gitster@pobox.com>2019-03-07 09:59:53 +0900
commit4e021dc28e71f9d820f7cf18567d9a86df326753 (patch)
tree7d3b0cf7a0da8c1ad7d77fcf72b9ecbe5dd1319e /config.c
parent42977bf5c7306e4c2dded5353f39cf087cf23a1f (diff)
parent39ab4d0951ba64edcfae7809740715991b44fa6d (diff)
downloadgit-4e021dc28e71f9d820f7cf18567d9a86df326753.tar.gz
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
Diffstat (limited to 'config.c')
-rw-r--r--config.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/config.c b/config.c
index 24ad1a9854..921f73dc96 100644
--- a/config.c
+++ b/config.c
@@ -1445,7 +1445,9 @@ int git_default_config(const char *var, const char *value, void *cb)
if (starts_with(var, "core."))
return git_default_core_config(var, value, cb);
- if (starts_with(var, "user."))
+ if (starts_with(var, "user.") ||
+ starts_with(var, "author.") ||
+ starts_with(var, "committer."))
return git_ident_config(var, value, cb);
if (starts_with(var, "i18n."))