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

Re: Conflict editing

From
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Date
Mar 5, 2007, 15:07 UTC
Message-ID
<20070305150728.GB17844@informatik.uni-freiburg.de>
In-Reply-To
<Pine.LNX.4.63.0703051223420.22628@wbgn013.biozentrum.uni-wuerzburg.de>
Hello,
Johannes Schindelin wrote:
Show 11 quoted lines
> > > Of course, this script is dumb and has no way to edit files whose 
> > > names contain spaces
> > 
> > Wouldn't using xargs fix that?
> 
> I tried that first, even in the proper form to catch newlines also, with 
> "-z" for ls-files and "-0" for xargs.
> 
> Alas, vi complained to me by saying "Not started from a terminal", and 
> wrecking my terminal settings. For example, echo was set to off, and 
> Ctrl+C no longer worked.

Another problem is, that only GNU xargs has -0, the version on Solaris (and probably on *BSD) doesn't know it.

Best regards Uwe

-- 
Uwe Kleine-König

http://www.google.com/search?q=gigabyte+in+bit
Previous: Johannes SchindelinNext: Brian Gernhardt
Message 10 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.