| commit | 3cc60ecdda7729496c3605449176000cc11412b6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Dec 2017 17:09:01 +0000 (6 09:09 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Dec 2017 17:09:01 +0000 (6 09:09 -0800) | ||
| tree | e5b632ae4cde54995a6538aef086fb5ce75d79c4 | treesnapshot (tar.gz zip) |
| parent | 74d6c9de9b89e56e641aff840b15e4a8fb291638 | commitdiff |
| parent | ae3b2b04bb88c8bbb298ceb5be634a3c0ba92159 | commitdiff |
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
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