diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:23 -0700 |
| commit | 7011ce12b895d172562dcaa7d8b240f3594dc981 (patch) | |
| tree | 7992b0e50a0539f1c06116cd9d7115713e659f70 /builtin/merge-ours.c | |
| parent | Merge branch 'ds/close-object-store' into maint (diff) | |
| parent | fetch: fix regression with transport helpers (diff) | |
| download | tgif-7011ce12b895d172562dcaa7d8b240f3594dc981.tar.xz | |
Merge branch 'fc/fetch-with-import-fix' into maint
Code restructuring during 2.20 period broke fetching tags via
"import" based transports.
* fc/fetch-with-import-fix:
fetch: fix regression with transport helpers
fetch: make the code more understandable
fetch: trivial cleanup
t5801 (remote-helpers): add test to fetch tags
t5801 (remote-helpers): cleanup refspec stuff
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions