Ingo Molnar wrote:
I've got the following, possibly stupid question: is there a way to
merge a healthy number of topic branches into the master branch in a
quicker way, when most of the branches are already merged up?
Right now i've got something like this scripted up:
for B in $(git-branch | cut -c3- ); do git-merge $B; done
It takes a lot of time to run on even a 3.45GHz box:
real 0m53.228s
user 0m41.134s
sys 0m11.405s
I just had a workflow incident where i forgot that this script was
running in one window (53 seconds are a _long_ time to start doing some
other stuff :-), i switched branches and the script merrily chugged away
merging branches into a topic branch i did not intend.
It iterates over 140 branches - but all of them are already merged up.
With the builtin merge (which is in next), this should be doable with
an octopus merge, which will eliminate the branches that are already
fully merged, resulting in a less-than-140-way merge (thank gods...).
It also doesn't have the 24-way cap that the scripted version suffers
from.
If it does a good job at your rather extreme use-case, I'd say it's
good enough for 'master' pretty soon :-)
--
Andreas Ericsson andreas.ericsson@xxxxxx
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
