Peter Maydell <peter.mayd...@linaro.org> writes: > On 13 February 2014 16:36, Markus Armbruster <arm...@redhat.com> wrote: >> I started splitting the patch, and it bores me to tears. >> >> Peter, any chance for applying as is, with all conflicting hunks >> summarily dropped? > > I'm afraid that sounds like too much manual effort on my part.
git-pull -s recursive -X ours ?
