lkml.org 
[lkml]   [2013]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [GIT PULL] Keyrings patches
Date
Stephen Rothwell <sfr@canb.auug.org.au> 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


\
 
 \ /
  Last update: 2013-09-18 14:01    [W:0.091 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site