summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-09 13:36:26 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-09 13:36:26 -0700
commit50c94032844bb184cdeff7779be3b6a23e04d312 (patch)
tree3f3510c51fcdcbbbceacf14b5f0d95bca3ce1547 /combine-diff.c
parent8502a779dad784785d9f3d5c880ce08b9ad0f483 (diff)
parentefe4be12490ab684786c48135731c4d2648bbecc (diff)
downloadgit-50c94032844bb184cdeff7779be3b6a23e04d312.tar.gz
Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8
* tr/maint-bundle-boundary: bundle: keep around names passed to add_pending_object() t5510: ensure we stay in the toplevel test dir t5510: refactor bundle->pack conversion
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions