From: Junio C Hamano Date: Wed, 6 Dec 2017 17:09:01 +0000 (-0800) Subject: Merge branch 'ew/rebase-mboxrd' into maint X-Git-Tag: v2.15.2~10 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3cc60ecdda7729496c3605449176000cc11412b6?hp=-c Merge branch 'ew/rebase-mboxrd' into maint 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 --- 3cc60ecdda7729496c3605449176000cc11412b6