On 2006-10-22 19:43:08 +0200, Petr Baudis wrote:
> Dear diary, on Sun, Oct 22, 2006 at 03:08:02PM CEST, I got a letter
> where Karl Hasselström <kha@xxxxxxxxxxx> said that...
>
> > Introduce an "assimilate" command, with no options. It takes any
> > GIT commits committed on top of your StGIT patch stack and
> > converts them into StGIT patches.
>
> Hmm, isn't this what stg uncommit does?
>
> Well, I'm not sure if what uncommit takes is from below the stack or
> above the stack, but if it's the former, it would still IMHO make
> more sense to just tell that StGIT with a switch or something.
Yes, you're correct in that uncommit and assimilate add existing
commits to the StGIT stack, but in different ends: uncommit grows the
stack by incorporating commits that precede it, while assimilate grows
the stack by incorporating commits that follows it.
The reason I decided to make a separate command is that the two
actions have different use cases: uncommit is for when you want to use
StGIT to manipulate commits that are already made; whereas assimilate
is for the case when you were happily using StGIT to manage a patch
series, and for whatever reason some regular GIT commits were made on
top of that stack, jamming any further StGIT manipulation.
The UIs are slightly different as a consequence: for uncommit, you
tell the command explicitly how many commits you want it to convert,
while assimilate will simply eat as much as it can (if it didn't,
there would still be git commits on top of your StGIT series, and it'd
still be jammed).
uncommit is really the opposite of commit. assimilate might just as
well have been called "fsck" or "cleanup".
Of course, my usability study had only one participant, and he was
rather biased since he's also the patch author, so this need not be
the final word on the matter.
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html