"Catalin Marinas" <catalin.marinas@xxxxxxxxx> writes: >> I always forget which stage is which. It would be nice if >> git-checkout-index implemented human-friendly names, just like >> git-diff-files has --base, --ours, --theirs, i.e. if it would be >> possible to write >> >> git checkout-index --stage=base|ours|theirs <filename> > > This gets even more confusing with StGIT. For plain git, after a git > merge or pull conflict, 'theirs' is stage 3. With StGIT, we first > advance the base of the stack and merge the patches onto it, in which > case the 'patched' (which I would normally call 'ours' rather than > 'theirs') is 3. True. And the same problem obviously exists for "git rebase". -- David Kågedal - 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
