]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 74d6c9d ae3b2b0)
Merge branch 'ew/rebase-mboxrd' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:09:01 +0000 (09:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:09:01 +0000 (09:09 -0800)
commit3cc60ecdda7729496c3605449176000cc11412b6
treee5b632ae4cde54995a6538aef086fb5ce75d79c4tree | snapshot
parent74d6c9de9b89e56e641aff840b15e4a8fb291638commit | diff
parentae3b2b04bb88c8bbb298ceb5be634a3c0ba92159commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.