summaryrefslogtreecommitdiff
path: root/commit-graph.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2025-05-16 20:04:18 +0000
committerJunio C Hamano <gitster@pobox.com>2025-05-16 15:09:14 -0700
commit29d7bf19512d8ca97be5cf708ca2e0bcc29408ab (patch)
treeba758870c3acb07b796a8205d6e7ad459e38f288 /commit-graph.c
parentc6d5ca10e3dcee91bcbefaf87753e93e9c1fa7a7 (diff)
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 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions