On Sun, Feb 16, 2025 at 8:37 AM Phillip Wood via GitGitGadget <gitgitgadget@xxxxxxxxx> wrote: > > From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> > > Add a section for --stdin in the list of options and document that it > implies -z so readers know how to parse the output. Makes sense. > Also correct the > merge status documentation for --stdin as if the status is less than > zero "git merge-tree" dies before printing it. This also makes sense, but...die'ing still has an exit status associated with it right? > Signed-off-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> > --- > Documentation/git-merge-tree.txt | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt > index 0b6a8a19b1f..efb16b4f27d 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 <<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) Should this line be kept but replace "<0" with "128" (the exit status of die)? > > [[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 > -- > gitgitgadget
