summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-30 06:43:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-30 06:43:50 (GMT)
commit32d5d732dd49e7beace91ea31db9f6c0315bc182 (patch)
tree414d0db989a5c120dd086aac2904a2b3dfe89128 /mergetools
parent5d8b3e5d8b5e11e4c931c29e27d835449eae56af (diff)
parentaaaa88182266f91ef99ff24847dabc44e08176b2 (diff)
downloadgit-32d5d732dd49e7beace91ea31db9f6c0315bc182.zip
git-32d5d732dd49e7beace91ea31db9f6c0315bc182.tar.gz
git-32d5d732dd49e7beace91ea31db9f6c0315bc182.tar.bz2
Merge branch 'jk/uploadpack-packobjectshook-fix'
Code clean-up that results in a small bugfix. * jk/uploadpack-packobjectshook-fix: upload-pack: fix broken if/else chain in config callback
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions