summaryrefslogtreecommitdiff
path: root/prompt.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-14 07:33:08 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-14 07:33:08 -0800
commit7842c44ccb89dc6c88e67bcc559bc9b38c617e0c (patch)
tree1a38b06514b6b94e9310bf18f72634bcfdb97ab0 /prompt.c
parentMerge branch 'pf/editor-ignore-sigint' into maint (diff)
parentapply.c:update_pre_post_images(): the preimage can be truncated (diff)
downloadtgif-7842c44ccb89dc6c88e67bcc559bc9b38c617e0c.tar.xz
Merge branch 'jc/apply-trailing-blank-removal' into maint
"git apply" misbehaved when fixing whitespace breakages by removing excess trailing blank lines. * jc/apply-trailing-blank-removal: apply.c:update_pre_post_images(): the preimage can be truncated
Diffstat (limited to 'prompt.c')
0 files changed, 0 insertions, 0 deletions