diff options
| author | Elijah Newren <newren@gmail.com> | 2025-05-16 20:04:18 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-05-16 15:09:14 -0700 |
| commit | 29d7bf19512d8ca97be5cf708ca2e0bcc29408ab (patch) | |
| tree | ba758870c3acb07b796a8205d6e7ad459e38f288 /Documentation | |
| parent | merge-ort: add a new mergeability_only option (diff) | |
| download | git-29d7bf19512d8ca97be5cf708ca2e0bcc29408ab.tar.gz git-29d7bf19512d8ca97be5cf708ca2e0bcc29408ab.zip | |
merge-tree: add a new --quiet flag
Git Forges may be interested in whether two branches can be merged while
not being interested in what the resulting merge tree is nor which files
conflicted. For such cases, add a new --quiet flag which
will make use of the new mergeability_only flag added to merge-ort in
the previous commit. This option allows the merge machinery to, in the
outer layer of the merge:
* exit early when a conflict is detected
* avoid writing (most) merged blobs/trees to the object store
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 |