Daniel Barkalow <barkalow@xxxxxxxxxxxx> wrote: > On Tue, 26 Aug 2008, Junio C Hamano wrote: > > > > Unless/until we have an easy way to obtain the information "git-ls-files > > -u" gives during conflict resolution, ls-files should stay on the list of > > commonly used commands. > > Doesn't "git status" tell you that? Or do you want the extra info from the > implicit --stage? I think he doesn't want to see the other files that are already merged successfully. git status shows them, git ls-files -u does not. -- Shawn. -- 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