From: "Shawn O. Pearce" <spearce@spearce.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: Conflict editing
Date: Sun, 4 Mar 2007 18:40:30 -0500 [thread overview]
Message-ID: <20070304234030.GA20116@spearce.org> (raw)
In-Reply-To: <Pine.LNX.4.63.0703041339350.22628@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> I often end up with conflicts, and I just want to edit the conflicting
> files, one after another. To make this easier, I wrote a script (yes, no
> builtin) to start the editor with the files having conflicts.
>
> -- snipsnap --
> #!/bin/sh
> #
> # Copyright (c) 2006, Shawn O. Pearce
Sweet! My evil plan is working... you do all of the work and I
get all of the credit! Last year to boot! ;-)
Yes, I did see the other message about how you copied the preamble
from git-gc.sh... ;-)
--
Shawn.
next prev parent reply other threads:[~2007-03-04 23:40 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 [this message]
2007-03-05 6:25 ` Brian Gernhardt
2007-03-05 11:25 ` Johannes Schindelin
2007-03-05 15:07 ` Uwe Kleine-König
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=20070304234030.GA20116@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.