]> git.ipfire.org Git - thirdparty/git.git/commit
merge-tree: improve docs for --stdin
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Tue, 18 Feb 2025 16:24:38 +0000 (16:24 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Feb 2025 17:52:40 +0000 (09:52 -0800)
commit3e681a7ccc97b81f9c93e5b4ca6d3a85d9817285
tree48cedcd45e825421a438dd2e46ac58763af7d289
parent54cf5d2da897d4ca2ed4872bd9b7e48851e5573e
merge-tree: improve docs for --stdin

Add a section for --stdin in the list of options and document that it
implies -z so readers know how to parse the output. Also correct the
merge status documentation for --stdin as if the status is less than
zero "git merge-tree" dies before printing it.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Acked-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-merge-tree.txt