summaryrefslogtreecommitdiff
path: root/Documentation/config/mergetool.txt
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2019-10-28 00:58:55 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-28 11:34:57 +0900
commit2eabd383134b7dedbda0e8367ef3df63c67a0445 (patch)
tree09ac0abf9b20bd2063baf57d2743d89196893a65 /Documentation/config/mergetool.txt
parentt/oid-info: add empty tree and empty blob values (diff)
downloadtgif-2eabd383134b7dedbda0e8367ef3df63c67a0445.tar.xz
rev-parse: add a --show-object-format option
Add an option to print the object format used for input, output, or storage. This allows shell scripts to discover the hash algorithm in use. Since the transition plan allows for multiple input algorithms, document that we may provide multiple results for input, and the format that the results may take. While we don't support this now, documenting it early means that script authors can future-proof their scripts for when we do. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/mergetool.txt')
0 files changed, 0 insertions, 0 deletions