summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-27 11:06:37 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-27 11:06:38 +0900
commit12e87e29ce60120a711b367b385b91fdc1c35a57 (patch)
tree8539eda70e953a70a466db631252ae40b6103453 /config.c
parentMerge branch 'tb/add-renormalize' (diff)
parentrebase: use mboxrd format to avoid split errors (diff)
downloadtgif-12e87e29ce60120a711b367b385b91fdc1c35a57.tar.xz
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
Diffstat (limited to 'config.c')
0 files changed, 0 insertions, 0 deletions