[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Fri, 6 Jun 2008 10:36:39 +0200
From: Ingo Molnar <mingo@...e.hu>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
the arch/x86 maintainers <x86@...nel.org>
Subject: Re: linux-next: Tree for June 5
* Andrew Morton <akpm@...ux-foundation.org> wrote:
> > Each tree is fine on its own if you go one step back from the merge.
>
> Well OK. But patches in fact _do_ go into Linux as a single linear
> stream of commits. But the whole git model ignores that reality and
> here we see the result.
it's fixable via "git-merge -n" and then doing a second git-merge, to
create only a single commit. OTOH, it's more transparent to have such
manual fixups in a followup commit.
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists