diff options
| author |  Jeff King <peff@peff.net> | 2020-10-23 03:10:15 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-10-23 08:25:22 -0700 |
| commit | 5f35edd9d7ebca17f205b338d340cc6ce214644a (patch) | |
| tree | 33c547ab8dae6c1cedef2af684dd08a0dd9086fe /Documentation/git-merge.txt | |
| parent | am: fix broken email with --committer-date-is-author-date (diff) | |
| download | tgif-5f35edd9d7ebca17f205b338d340cc6ce214644a.tar.xz | |
rebase: fix broken email with --committer-date-is-author-date
Commit 7573cec52c (rebase -i: support --committer-date-is-author-date,
2020-08-17) copied the committer ident-parsing code from builtin/am.c.
And in doing so, it copied a bug in which we always set the email to an
empty string. We fixed the version in git-am in the previous commit;
this commit fixes the copied code.
Reported-by: VenomVendor <info@venomvendor.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions