[PATCH] Use git pull with rebase in build script

Linus Torvalds torvalds at linux-foundation.org
Sun Jul 12 10:02:15 PDT 2015


On Sun, Jul 12, 2015 at 7:05 AM, Dirk Hohndel <dirk at hohndel.org> wrote:
>
> Thanks for the explanation, Henrik. I read a bit through the git-rebase
> manpage and that has not necessarily completely enlightened me on the
> wisdom of this changes.

I suspect it ends up working better in practice, although I do think
it has the chance of being really really horribly broken when you do a
non-fast-forward.

I dunno. The current situation isn't good either. The whole "base
things on a branch that does non-fast-forwards" model really is
entirely broken.

                 Linus


More information about the subsurface mailing list