diff options
Diffstat (limited to 'Documentation/git-merge-tree.adoc')
| -rw-r--r-- | Documentation/git-merge-tree.adoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-merge-tree.adoc b/Documentation/git-merge-tree.adoc index 4e13ed33d6..4391bbee47 100644 --- a/Documentation/git-merge-tree.adoc +++ b/Documentation/git-merge-tree.adoc @@ -59,7 +59,8 @@ OPTIONS do not list filenames multiple times if they have multiple conflicting stages). ---[no-]messages:: +--messages:: +--no-messages:: Write any informational messages such as "Auto-merging <path>" or CONFLICT notices to the end of stdout. If unspecified, the default is to include these messages if there are merge |