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

Re: Conflict editing

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Mar 5, 2007, 11:25 UTC
Message-ID
<Pine.LNX.4.63.0703051223420.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<190CCFDA-7BCC-4CC9-81D5-F38B14D8D54D@silverinsanity.com>
Hi,
On Mon, 5 Mar 2007, Brian Gernhardt wrote:
Show 6 quoted lines
> 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?

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.

Since I am a nice person, I did not want you to have the same experience with this dumb script.

Ciao, Dscho

Previous: Brian GernhardtNext: Uwe Kleine-König
Message 9 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.