diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-10-08 21:53:25 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-10-08 21:53:26 -0700 |
commit | c7ac8c0a7ccba76f082b9fd9c7e35b66209d8bf3 (patch) | |
tree | 78b36cf20a92eb637f6a2d5be57c53bcde7818cd /Documentation/git-merge-tree.txt | |
parent | Merge branch 'dl/mingw-header-cleanup' (diff) | |
parent | index-pack: make get_base_data() comment clearer (diff) | |
download | tgif-c7ac8c0a7ccba76f082b9fd9c7e35b66209d8bf3.tar.xz |
Merge branch 'jk/index-pack-hotfixes'
Hotfix and clean-up for the jt/threaded-index-pack topic that has
graduated to v2.29-rc0.
* jk/index-pack-hotfixes:
index-pack: make get_base_data() comment clearer
index-pack: drop type_cas mutex
index-pack: restore "resolving deltas" progress meter
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions