From: Phillip Wood Date: Tue, 18 Feb 2025 16:24:38 +0000 (+0000) Subject: merge-tree: improve docs for --stdin X-Git-Tag: v2.49.0-rc0~7^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e681a7ccc97b81f9c93e5b4ca6d3a85d9817285;p=thirdparty%2Fgit.git 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 Acked-by: Elijah Newren Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index 0b6a8a19b1..efb16b4f27 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -40,6 +40,11 @@ After the merge completes, a new toplevel tree object is created. See OPTIONS ------- +--stdin:: + Read the commits to merge from the standard input rather than + the command-line. See <> below for more + information. Implies `-z`. + -z:: Do not quote filenames in the section, and end each filename with a NUL character rather than @@ -116,8 +121,6 @@ This is an integer status followed by a NUL character. The integer status is: 0: merge had conflicts 1: merge was clean - <0: something prevented the merge from running (e.g. access to repository - objects denied by filesystem) [[OIDTLT]] OID of toplevel tree @@ -235,6 +238,7 @@ with linkgit:git-merge[1]: * any messages that would have been printed to stdout (the <>) +[[INPUT]] INPUT FORMAT ------------ 'git merge-tree --stdin' input format is fully text based. Each line