]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b927c80 5f35edd)
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)
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

1  2 
builtin/am.c patch | diff1 | diff2 | blob | history
sequencer.c patch | diff1 | diff2 | blob | history

diff --cc builtin/am.c
Simple merge
diff --cc sequencer.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.