Hi, It seems stgit does not use git-rerere, so why not? Any reason other than it hasn't been done yet? I abuse stgit heavily, by frequently reording patches, which for some patches result in re-occuring conflicts. git-rerere seems to be the solution. What's the "rules" for when to invoke rerere? It seems it is mostly automatic in git, but since only the porcelainish commands use it, that means StGIT doesn't. So here is what I *think* needs to be done. Seems simple enough. stg push, stg pick, stg import, stg goto, stg fold, stg float do what push does and invoke git-rerere at the end whether the push ends with conflicts or not stg pop nothing, or do I need to remove rr-cache/MERGE_RR, like git-reset does? stg status --reset, stg push --undo remove rr-cache/MERGE_RR ? stg refresh do what stgit does normally and then invoke git-rerere stg resolved: do what stgit does normally and then invoke git-rerere stg clean, stge delete: remove rr-cache/MERGE_RR ? Anything else or comments on this list? -- robin - 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