On Fri, Apr 20, 2007 at 12:39:43PM CEST, Junio C Hamano wrote: > The problem I described is that sometimes I > do not even recall if I was rebasing or merging after resolving > conflicts. If I *knew* I was in the middle of a rebase, I know > where to look (.dotest/ has all the necessary "state" for > rebase/am to continue) to remind me where I was. In Cogito, cg-status always tell you that you're in the middle of something special if you are. Perhaps git status could let you know as well. (It wouldn't be as easy to see since git status seems so verbose though compared to cg-status; that has been one of my pet peeves, though I suppose it's unlikely to change. ;-) -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ Ever try. Ever fail. No matter. // Try again. Fail again. Fail better. -- Samuel Beckett - 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