diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-12-03 00:18:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-03 00:18:06 -0800 |
| commit | 39d38a5c5f51ff2f4685bdc9f1af6f4cb0dcd33c (patch) | |
| tree | fdfdda0a6306b9166e8c7996fd9acbdca5ac78d6 /t/t7605-merge-resolve.sh | |
| parent | Merge branch 'pb/pull-rebase-recurse-submodules' (diff) | |
| parent | builtin/repack.c: don't move existing packs out of the way (diff) | |
| download | tgif-39d38a5c5f51ff2f4685bdc9f1af6f4cb0dcd33c.tar.xz | |
Merge branch 'tb/repack-simplify'
Simplify the logic to deal with a repack operation that ended up
creating the same packfile.
* tb/repack-simplify:
builtin/repack.c: don't move existing packs out of the way
builtin/repack.c: keep track of what pack-objects wrote
repack: make "exts" array available outside cmd_repack()
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions