diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-10-05 21:01:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-05 21:01:53 (GMT) |
| commit | e68f0a4e574f38beeac513e824b685965dda31b7 (patch) | |
| tree | 91c653dc49ef9a5e1b9d6f5354823d93f480540c /builtin/merge.c | |
| parent | 300cd14ee92eaa0e56688078e967402371488013 (diff) | |
| parent | 23547c40518ac04a20acf2f688114f5d97b61f24 (diff) | |
| download | git-e68f0a4e574f38beeac513e824b685965dda31b7.zip git-e68f0a4e574f38beeac513e824b685965dda31b7.tar.gz git-e68f0a4e574f38beeac513e824b685965dda31b7.tar.bz2 | |
Merge branch 'jt/keep-partial-clone-filter-upon-lazy-fetch'
The lazy fetching done internally to make missing objects available
in a partial clone incorrectly made permanent damage to the partial
clone filter in the repository, which has been corrected.
* jt/keep-partial-clone-filter-upon-lazy-fetch:
fetch: do not override partial clone filter
promisor-remote: remove unused variable
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions