summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2021-01-07 16:32:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-01-16 07:04:46 (GMT)
commit22ad8600c1d45ade6bd4b6bd5df87ad733b0575a (patch)
tree851ac7f190c00510d9db77d6963a9b7b9437f3ea /git-merge-resolve.sh
parent845d15d4d07bef903bf6f87275d2be11ca0647b5 (diff)
downloadgit-22ad8600c1d45ade6bd4b6bd5df87ad733b0575a.zip
git-22ad8600c1d45ade6bd4b6bd5df87ad733b0575a.tar.gz
git-22ad8600c1d45ade6bd4b6bd5df87ad733b0575a.tar.bz2
index-format: update preamble to cache tree extension
I had difficulty in my efforts to learn about the cache tree extension based on the documentation and code because I had an incorrect assumption about how it behaved. This might be due to some ambiguity in the documentation, so this change modifies the beginning of the cache tree format by expanding the description of the feature. My hope is that this documentation clarifies a few things: 1. There is an in-memory recursive tree structure that is constructed from the extension data. This structure has a few differences, such as where the name is stored. 2. What does it mean for an entry to be invalid? 3. When exactly are "new" trees created? Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions