]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 722acf8 0acbaf9)
Merge branch 'kk/merge-octopus-optim' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 May 2026 01:32:35 +0000 (10:32 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 May 2026 01:32:35 +0000 (10:32 +0900)
commitafe427dc66dbcc20b25a2732023780f77e91c552
tree60e1dc6d013571e2642143fc86e4b11e42e56ca1tree | snapshot
parent722acf81c876cdbe376e8989e74566729bcb8922commit | diff
parent0acbaf9000bd50bfbec24e5c40ab96bbd5e79281commit | diff
Merge branch 'kk/merge-octopus-optim' into next

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.