diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:08 -0800 |
| commit | cbc8d6d8f8e858072faa2f8fd03d0f255fe0c288 (patch) | |
| tree | 348aa7a55aa16299c5935e18bbe69acdc5129f10 /mergetools/bc | |
| parent | f5a191d3dcbd0deaae9eba2a141e0f086ea0eb20 (diff) | |
| parent | b0a4264277b7968741580093e7ea1e366943d297 (diff) | |
| download | git-cbc8d6d8f8e858072faa2f8fd03d0f255fe0c288.tar.gz git-cbc8d6d8f8e858072faa2f8fd03d0f255fe0c288.tar.xz | |
Merge branch 'jk/prune-mtime' into maint
In v2.2.0, we broke "git prune" that runs in a repository that
borrows from an alternate object store.
* jk/prune-mtime:
sha1_file: fix iterating loose alternate objects
for_each_loose_file_in_objdir: take an optional strbuf path
Diffstat (limited to 'mergetools/bc')
0 files changed, 0 insertions, 0 deletions