On Mon, Nov 8, 2010 at 11:39 PM, Chris Packham <judge.packham@xxxxxxxxx> wrote: > Has anyone looked at making stgit interact with git-rebase more gracefully? The problem is that StGit's metadata gets out of date when you do a git rebase. A solution would either have to change StGit's metadata representation so that it can't get out of date, or be a fancy version of repair/uncommit that can actually figure out what git did. I've thought a bit about this in the past, and the best solution I could come up with is of the first kind, and would change the representation of applied patches to use just two refs: the branch itself, and the stack base ref. I think git rebase wouldn't wreck things for that representation. This kind of change is a lot of work, though, more than I have time for at the moment. And it's not like I have the details worked out or anything... Making stg repair more intelligent would be a lot less involved. -- Karl Wiberg, kha@xxxxxxxxxxx ÂÂ subrabbit.wordpress.com ÂÂ 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