diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-05-27 13:59:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-05-27 13:59:08 -0700 |
| commit | f545f401be93241cfefbeed3a25b63045c8fc3a7 (patch) | |
| tree | 8c85ec40b35601f22327445d8017f573b4f964d6 /Documentation | |
| parent | Merge branch 'jk/no-funny-object-types' (diff) | |
| parent | merge-tree: add a new --quiet flag (diff) | |
| download | git-f545f401be93241cfefbeed3a25b63045c8fc3a7.tar.gz git-f545f401be93241cfefbeed3a25b63045c8fc3a7.zip | |
Merge branch 'en/merge-tree-check'
"git merge-tree" learned an option to see if it resolves cleanly
without actually creating a result.
* en/merge-tree-check:
merge-tree: add a new --quiet flag
merge-ort: add a new mergeability_only option
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-merge-tree.adoc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-merge-tree.adoc b/Documentation/git-merge-tree.adoc index cf0578f9b5..f824eea61f 100644 --- a/Documentation/git-merge-tree.adoc +++ b/Documentation/git-merge-tree.adoc @@ -65,6 +65,12 @@ OPTIONS default is to include these messages if there are merge conflicts, and to omit them otherwise. +--quiet:: + Disable all output from the program. Useful when you are only + interested in the exit status. Allows merge-tree to exit + early when it finds a conflict, and allows it to avoid writing + most objects created by merges. + --allow-unrelated-histories:: merge-tree will by default error out if the two branches specified share no common history. This flag can be given to override that |