Merge branch 'jk/committer-date-is-author-date-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Oct 2020 21:18:47 +0000 (14:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Oct 2020 21:18:47 +0000 (14:18 -0700)
commit4f9f7c14426bde47416067e2d202b05ed2c3fc6a
treeab88baa607a070dd2266c4f2092d866c6d964412
parentb927c80531cca9b9107754186532e8cb00884008
parent5f35edd9d7ebca17f205b338d340cc6ce214644a
Merge branch 'jk/committer-date-is-author-date-fix' into maint

In 2.29, "--committer-date-is-author-date" option of "rebase" and
"am" subcommands lost the e-mail address by mistake, which has been
corrected.

* jk/committer-date-is-author-date-fix:
  rebase: fix broken email with --committer-date-is-author-date
  am: fix broken email with --committer-date-is-author-date
  t3436: check --committer-date-is-author-date result more carefully
builtin/am.c
sequencer.c