summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-08-24 14:54:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-24 14:54:31 -0700
commitd1ff7411f3538812796048e8f5bba717bb79fa2f (patch)
tree2a275d3df34ef2898ad888f4835babe8654c3cd7 /merge.c
parentMerge branch 'rs/more-buffered-io' (diff)
parentDocumentation: mark `--object-format=sha256` as experimental (diff)
downloadtgif-d1ff7411f3538812796048e8f5bba717bb79fa2f.tar.xz
Merge branch 'ma/doc-sha-256-is-experimental'
The recent addition of SHA-256 support is marked as experimental in the documentation. * ma/doc-sha-256-is-experimental: Documentation: mark `--object-format=sha256` as experimental
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions