summaryrefslogtreecommitdiff
path: root/submodule-config.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-12-06 09:09:01 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-12-06 09:09:01 -0800
commit3cc60ecdda7729496c3605449176000cc11412b6 (patch)
treee5b632ae4cde54995a6538aef086fb5ce75d79c4 /submodule-config.h
parentMerge branch 'sd/branch-copy' into maint (diff)
parentrebase: use mboxrd format to avoid split errors (diff)
downloadtgif-3cc60ecdda7729496c3605449176000cc11412b6.tar.xz
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
Diffstat (limited to 'submodule-config.h')
0 files changed, 0 insertions, 0 deletions