On Fri, Oct 17, 2008 at 11:16, Jakub Narebski <jnareb@xxxxxxxxx> wrote: > From time to time somebody proposes to add a command which is used > only to say that given conflict got resolved, i.e. yet another > porcelain "around" git-update-index plumbing (in addition to git-add, > git-mv and git-rm). One of problems is how to call it: git-resolve, > git-resolved, git-mark-resolved? In that case, you would still need a pre-add hook. The problem is not that people can't mark resolved without adding. It's that they can't add without checking (automatically) if there are no conflicts. Richard -- 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
