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

Re: Conflict editing

From
Brian Gernhardt <benji@silverinsanity.com>
Date
Mar 5, 2007, 06:25 UTC
Message-ID
<190CCFDA-7BCC-4CC9-81D5-F38B14D8D54D@silverinsanity.com>
In-Reply-To
<Pine.LNX.4.63.0703041339350.22628@wbgn013.biozentrum.uni-wuerzburg.de>
On Mar 4, 2007, at 7:43 AM, Johannes Schindelin wrote:
> Of course, this script is dumb and has no way to edit files whose  
> names
> contain spaces
Wouldn't using xargs fix that?
> "${VISUAL:-${EDITOR:-vi}}" $(git ls-files --unmerged | cut -b51- |  
> uniq)

git ls-files --unmerged | cut -b51- | uniq | xargs "${VISUAL:-$ {EDITOR:-vi}}"

~~ Brian Gernhardt
Previous: Shawn O. PearceNext: Johannes Schindelin
Message 8 of 11 in “Conflict editing”
  1. Johannes SchindelinMar 4, 2007
  2. Johannes SchindelinMar 4, 2007
  3. Theodore TsoMar 4, 2007
  4. Martin LanghoffMar 4, 2007
  5. Theodore TsoMar 5, 2007
  6. Martin LanghoffMar 5, 2007
  7. Shawn O. PearceMar 4, 2007
  8. Brian GernhardtMar 5, 2007
  9. Johannes SchindelinMar 5, 2007
  10. Uwe Kleine-KönigMar 5, 2007
  11. Brian GernhardtMar 5, 2007

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.