summaryrefslogtreecommitdiff
path: root/mergetools/tkdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-10-01 12:58:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-10-01 12:58:34 -0700
commit03b98d2e78debf163d0dccc98a213dcd4608d7d8 (patch)
tree2ca07f03a4489b25fea0ec1f2dd39177b7187d20 /mergetools/tkdiff
parentMerge branch 'rt/maint-clone-single' (diff)
parentreceive-pack: drop "n/a" on unpacker errors (diff)
downloadtgif-03b98d2e78debf163d0dccc98a213dcd4608d7d8.tar.xz
Merge branch 'jk/receive-pack-unpack-error-to-pusher'
Send errors from "unpack-objects" and "index-pack" back to the "git push" over the git and smart-http protocols, just like it is done for a push over the ssh protocol. * jk/receive-pack-unpack-error-to-pusher: receive-pack: drop "n/a" on unpacker errors receive-pack: send pack-processing stderr over sideband receive-pack: redirect unpack-objects stdout to /dev/null
Diffstat (limited to 'mergetools/tkdiff')
0 files changed, 0 insertions, 0 deletions