On Thu, Aug 21, 2008 at 8:15 AM, Paolo Bonzini <bonzini@xxxxxxx> wrote: > I used to think that the proposal I saw in another git frontend, which is: > > git diff --cached --> git diff --staged > git diff --> git diff --unstaged > git diff HEAD --> git diff > > was a good one, but it is actually not when you start thinking about what to > do during a large merge with few conflicts. In fact, even though I use the > index almost exclusively when merging (*), I don't mind the few extra > keystrokes. If you look a little closer, you'll note that the three lines of this proposal has an exception specifically for the conflict during merge case. :-) Elijah -- 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
