diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 00:59:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 00:59:53 (GMT) |
| commit | 4e021dc28e71f9d820f7cf18567d9a86df326753 (patch) | |
| tree | 7d3b0cf7a0da8c1ad7d77fcf72b9ecbe5dd1319e /builtin/am.c | |
| parent | 42977bf5c7306e4c2dded5353f39cf087cf23a1f (diff) | |
| parent | 39ab4d0951ba64edcfae7809740715991b44fa6d (diff) | |
| download | git-4e021dc28e71f9d820f7cf18567d9a86df326753.zip git-4e021dc28e71f9d820f7cf18567d9a86df326753.tar.gz git-4e021dc28e71f9d820f7cf18567d9a86df326753.tar.bz2 | |
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 'builtin/am.c')
| -rw-r--r-- | builtin/am.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/am.c b/builtin/am.c index 58a2aef..cd051fe 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1579,6 +1579,7 @@ static void do_commit(const struct am_state *state) } author = fmt_ident(state->author_name, state->author_email, + WANT_AUTHOR_IDENT, state->ignore_date ? NULL : state->author_date, IDENT_STRICT); |