]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17d9dbd 29d7bf1)
Merge branch 'en/merge-tree-check'
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 May 2025 20:59:08 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 May 2025 20:59:08 +0000 (13:59 -0700)
"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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.