diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-02-24 22:10:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-24 22:10:37 -0800 |
| commit | 117c1b333da05e87a35ea73756518abe52407d84 (patch) | |
| tree | 8c7dc4c0fbe9b7d26f2955ee3b95c626f3e1f6cb /merge-recursive.c | |
| parent | Merge branch 'jc/diff-format-doc' into maint (diff) | |
| parent | dumb-http: do not pass NULL path to parse_pack_index (diff) | |
| download | tgif-117c1b333da05e87a35ea73756518abe52407d84.tar.xz | |
Merge branch 'jk/dumb-http-idx-fetch-fix' into maint
A broken pack .idx file in the receiving repository prevented the
dumb http transport from fetching a good copy of it from the other
side.
* jk/dumb-http-idx-fetch-fix:
dumb-http: do not pass NULL path to parse_pack_index
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions