Matthias Urlichs <smurf@xxxxxxxxxxxxxx> writes: > I wonder why git-ls-files --unmerged implies --stages. One nice use case > for this command is to edit all the conflicting files after a failed > merge, i.e. > > $ vi $(git-ls-files --unmerged) > > except I need a pipe to throw out all the cruft in there. I typically use git diff --name-only for this (yes I probably need to uniq them out), but you can certainly talk me into introducing --unmerged --name-only. If nobody objects, even making --unmerged independent from --stages might be a sensible thing to do -- if we do so you would need --unmerged --stages to get the current behaviour. - : 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