]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history

diff --cc builtin/merge.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.