git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: How do I get a list of all unmerged files?

From
EREric Raible <raible@nextest.com>
Date
Oct 26, 2010, 17:06 UTC
Message-ID
<4CC70A9B.4030801@nextest.com>
In-Reply-To
<20101026143245.11433.qmail@science.horizon.com>
On 11:59 AM, George Spelvin wrote:
Show 14 quoted lines
> 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`
> 
> Thank you.

It's not exactly what you asked for but this might give you what you want:

	git config merge.tool vim
	git mergetool
HTH - Eric
Previous: Gavin Guo
Message 8 of 8 in “How do I get a list of all unmerged files?”
  1. George SpelvinOct 26, 2010
  2. Jay SoffianOct 26, 2010
  3. Eric RaibleOct 27, 2010
  4. Joshua JuranOct 27, 2010
  5. Eric RaibleOct 27, 2010
  6. Junio C HamanoOct 26, 2010
  7. Gavin GuoOct 26, 2010
  8. Eric RaibleOct 26, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.