diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-26 10:27:29 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-26 10:27:29 -0700 |
commit | 420147290dc6f96d5007da7a089ab2ac9f1e99d4 (patch) | |
tree | c6347d1fe1408421b12d69512407e4c866930fde /xdiff/xmerge.c | |
parent | Git 1.7.4.5 (diff) | |
parent | upload-pack: start pack-objects before async rev-list (diff) | |
download | tgif-420147290dc6f96d5007da7a089ab2ac9f1e99d4.tar.xz |
Merge branch 'jk/maint-upload-pack-shallow' into maint-1.7.4
* jk/maint-upload-pack-shallow:
upload-pack: start pack-objects before async rev-list
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions