On Sun, Jun 03, 2007 at 02:32:54PM +0200, Karl Hasselström wrote: > On 2007-06-01 11:22:12 +0200, David Kågedal wrote: > > > This is something I've been missing. > > I believe this is useful, too. > > > But I'd call it "stg merge" or something, since what it does is that > > it merges the top patch into the patch below it. But since "merge" > > means something else to git, it might not be the best choice. > > Maybe "coalesce"? I recall using that word when turning several > consecutive memory blocks into a single larger block in a malloc > implementation, and this sitiation is very similar. Hm, maybe, but the idea is not necessarily to merge this patch into the former one (I have written contrib/stg-swallow for this use), but really to turn the patch into just local changes (eg. to restore local changes after a complex operation, like in stg-k). > It would be nice if it was possible to specify an arbitrary series of > patches, and get them coalesced into one. (StGIT would have to push > and pop to place them consecutively and topmost.) With a parameter to > control the name of the new large patch, and the comment being the > concatenation of the comments of the component patches (easily > editable in the editor window that pops up). stg-swallow would be quite easy to extend for this usage. Best regards, -- Yann. - 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
