Re: [GIT PULL] Keyrings patches

[David Howells]

Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Is there some reason that those fixups cannot be done in a merge commit?
> i.e. are they more than simple text updates?

That's somewhat up to James.  *He* would be the person doing the merge, not
me.  I'm changing the lines in my patches also.

> /me thinks that most rebases people do can be better done (and
> documented) as merges.

That depends on how you define "better".  Better for what?  I think it's
better to absorb the changes into my patch series.  StGIT is very good for
handling this, since my patches are currently maintained as an StGIT set.
That way, there ends up one fewer commit in the history, assuming no other
collisions with what James merges.

David
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/