Messages in this thread | | | Date | Fri, 6 Jun 2008 10:36:39 +0200 | From | Ingo Molnar <> | Subject | Re: linux-next: Tree for June 5 |
| |
* Andrew Morton <akpm@linux-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
| |