On Tue, Oct 26, 2010 at 10:32 AM, George Spelvin <linux@xxxxxxxxxxx> wrote: > After a merge with conflicts, mostly resolved by rerere, I want to pass a list of > all unmerged files to the editor for manual review. > > I can see the list (wrapped in a bunch of inconvenient human-readable cruft) > in "git status". ÂI can also get a list (again with a bunch of extraneous > info) from "git ls-files -u". ÂWhat I can't figure out is how to get > "git ls-files -u" with --stage turned *off*. > > I'm sure this exists somewhere, but I can't find it. ÂCan someone enlighten > me? > > vim `git command here` $ git help unmerged `git unmerged' is aliased to `!git ls-files --unmerged | cut -f2 | uniq' If there's a better way to do it, I don't know what it is. j. -- 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