From: Petr Baudis
Date: Sun Sep 24 2006 - 10:30:37 EST
Dear diary, on Sun, Sep 24, 2006 at 04:20:06PM CEST, I got a letter
where Russell King <rmk+lkml@xxxxxxxxxxxxxxxx> said that...
> I'm now told that the resulting tree after all the commits is correct.
> The problem is that all the files which were supposed to be deleted by
> previous patches ended up actually being deleted by the final patch in
> the series.
> So the resulting tree is fine, it's just that the history is rather
Well, that rewritehist batch should work fine even in this case.
(Of course that's assuming that no change was supposed to happen to
those files in the last four days.)
> I think a solution to this might be to use git-apply, but there's one
> draw back - I currently have the facility to unpatch at a later date,
> but git-apply doesn't support -R.
Yes, if there's not too many patches perhaps using git-apply -R would be
simpler. git-apply in git-220.127.116.11 does support -R.
Petr "Pasky" Baudis
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/