git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Uwe Kleine-König" <ukleinek@informatik.uni-freiburg.de>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Brian Gernhardt <benji@silverinsanity.com>, git@vger.kernel.org
Subject: Re: Conflict editing
Date: Mon, 5 Mar 2007 16:07:28 +0100	[thread overview]
Message-ID: <20070305150728.GB17844@informatik.uni-freiburg.de> (raw)
In-Reply-To: <Pine.LNX.4.63.0703051223420.22628@wbgn013.biozentrum.uni-wuerzburg.de>

Hello,

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.
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

  reply	other threads:[~2007-03-05 15:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-03-04 12:43 Conflict editing Johannes Schindelin
2007-03-04 13:29 ` Johannes Schindelin
2007-03-04 18:10 ` Theodore Tso
2007-03-04 21:59   ` Martin Langhoff
2007-03-05  4:04     ` Theodore Tso
2007-03-05  4:48       ` Martin Langhoff
2007-03-04 23:40 ` Shawn O. Pearce
2007-03-05  6:25 ` Brian Gernhardt
2007-03-05 11:25   ` Johannes Schindelin
2007-03-05 15:07     ` Uwe Kleine-König [this message]
2007-03-05 19:27     ` Brian Gernhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070305150728.GB17844@informatik.uni-freiburg.de \
    --to=ukleinek@informatik.uni-freiburg.de \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=benji@silverinsanity.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).