]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 51445a0) | patch
onemerge: make sure each merge in master..seen brings in only one topic
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Jun 2026 16:25:16 +0000 (09:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Jun 2026 16:25:16 +0000 (09:25 -0700)
commitca61a38eca70897e2db33efc913a7b682168de52
tree0fec092cba043584170a0af20f80867b424324ddtree | snapshot
parent51445a0c5efe5734fc31f302f066d9797b16b8f3commit | diff
onemerge: make sure each merge in master..seen brings in only one topic

If a topic B is built on top of a merge of topic A into master, then
we should merge topic A first before topic B when preparing the
integration branches.  Merging topic B first would bring topic A
along with it, which is generally not a good idea if we consider A
and B as two separate topics.
onemerge.sh [new file with mode: 0755] blob
Unnamed repository; edit this file 'description' to name the repository.