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>
This commit is contained in:

committed by
Junio C Hamano

parent
54cf5d2da8
commit
3e681a7ccc
@ -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 <<INPUT,INPUT FORMAT>> below for more
|
||||
information. Implies `-z`.
|
||||
|
||||
-z::
|
||||
Do not quote filenames in the <Conflicted file info> 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
|
||||
<<IM,Informational messages>>)
|
||||
|
||||
[[INPUT]]
|
||||
INPUT FORMAT
|
||||
------------
|
||||
'git merge-tree --stdin' input format is fully text based. Each line
|
||||
|
Reference in New Issue
Block a user