Yann Dirson <ydirson@xxxxxxxxxx> wrote: > I'd suggest to use stgit to prepare commits before publication. Even > if you don't feel the need for it in everyday life, you can have a > one-shot use for this particular problem, by turning your latest > commits into an stgit stack, use stgit facilities to handle posible > conflicts, and turn them into commits again: > > The nominal case goes: > > stg init > stg uncommit -n <ncommits> > stg float <patch-to-kill> > stg delete <patch-to-kill> or "stg pop <patch-to-kill>" instead of 'float'. Recently, I changed the 'pop' command to accept individual patches and patch ranges (for symmetry with 'push'). -- Catalin - 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