Message ID | a017982009267da5157d314a7d3061bac60ea8af.1739895879.git.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 6a9ae8101525360b8f79ed20d2f483616bd39c90 |
Headers | show |
Series | merge-tree --stdin: flush stdout | expand |
diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index efb16b4f27d..cf0578f9b5e 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -49,7 +49,8 @@ OPTIONS Do not quote filenames in the <Conflicted file info> section, and end each filename with a NUL character rather than newline. Also begin the messages section with a NUL character - instead of a newline. See <<OUTPUT>> below for more information. + instead of a newline. See <<OUTPUT,OUTPUT>> below for more + information. --name-only:: In the Conflicted file info section, instead of writing a list