I have 100 patches loaded into in stgit. My tree is at 2.6.30. Now I want to rebase to 2.6.31-rc1. About 30 of these hundred patches got committed in this interval. If I rebase directly to 2.6.31-rc1 I end up with a bunch of merge conflicts as the patches are applied. That's because patches 'a,b,c' got applied in the merge window. When I push 'a' back down it sees the combination of 'a,b,c' not just 'a'. It is unable to figure out that 'a' was applied and then 'b' and 'c' applied on top of it. Is there a better way to locate the patches the got applied? -- Jon Smirl jonsmirl@xxxxxxxxx -- 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