summaryrefslogtreecommitdiff
path: root/t/t6417-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-08-19 16:14:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-19 16:14:52 -0700
commit74a395c4844f846d933b873c5548e19d06e1e89e (patch)
tree0ebaf7ab79d845a6d2dbb62687ed199efb9551a4 /t/t6417-merge-ours-theirs.sh
parentMerge branch 'jc/object-names-are-not-sha-1' (diff)
parentshallow.txt: document SHA-256 shallow format (diff)
downloadtgif-74a395c4844f846d933b873c5548e19d06e1e89e.tar.xz
Merge branch 'ma/sha-256-docs'
Further update of docs to adjust to the recent SHA-256 work. * ma/sha-256-docs: shallow.txt: document SHA-256 shallow format protocol-capabilities.txt: clarify "allow-x-sha1-in-want" re SHA-256 index-format.txt: document SHA-256 index format http-protocol.txt: document SHA-256 "want"/"have" format
Diffstat (limited to 't/t6417-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions