]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6d2ba7e 0acbaf9)
Merge branch 'kk/merge-octopus-optim'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 May 2026 05:15:44 +0000 (14:15 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 May 2026 05:15:44 +0000 (14:15 +0900)
commit9020a116d63828a9bd521564d9d41b2c0136e6d2
treecdcd8f96977b7f214a5222a28329c67af85b5849tree | snapshot
parent6d2ba7ead7ab074bfd88e194bb75d6b384c44d4ecommit | diff
parent0acbaf9000bd50bfbec24e5c40ab96bbd5e79281commit | diff
Merge branch 'kk/merge-octopus-optim'

The logic to determine that branches in an octopus merge are
independent has been optimized.

* kk/merge-octopus-optim:
  merge: use repo_in_merge_bases for octopus up-to-date check
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.