From: Junio C Hamano Date: Mon, 27 Nov 2017 02:06:37 +0000 (+0900) Subject: Merge branch 'ew/rebase-mboxrd' X-Git-Tag: v2.16.0-rc0~95 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/12e87e29ce60120a711b367b385b91fdc1c35a57 Merge branch 'ew/rebase-mboxrd' When "git rebase" prepared an mailbox of changes and fed it to "git am" to replay them, it was confused when a stray "From " happened to be in the log message of one of the replayed changes. This has been corrected. * ew/rebase-mboxrd: rebase: use mboxrd format to avoid split errors --- 12e87e29ce60120a711b367b385b91fdc1c35a57