From: skillzero@gmail.com
To: git@vger.kernel.org
Subject: Re: Retry conflicting merge with matching line endings?
Date: Tue, 17 Feb 2009 19:44:40 -0800 [thread overview]
Message-ID: <2729632a0902171944l7a5ca5b4nf6d77bc7f9c1b201@mail.gmail.com> (raw)
In-Reply-To: <7v8wo41o8d.fsf@gitster.siamese.dyndns.org>
On Tue, Feb 17, 2009 at 6:18 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
> This is not specific to fixing line ending but applies any "global token
> replacement" (e.g. you renamed a variable) operation in general.
Thanks for the details. I was previously resolving things in a more
tedious manner and your steps will make things easier for me.
What I was curious about though is whether it would be reasonable for
me to submit a patch to have git automatically try this for the
special case of line endings (possibly implemented as a general token
replacement scheme with built-in filters for line endings)?
prev parent reply other threads:[~2009-02-18 3:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-18 1:55 Retry conflicting merge with matching line endings? skillzero
2009-02-18 2:18 ` Junio C Hamano
2009-02-18 3:44 ` skillzero [this message]
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=2729632a0902171944l7a5ca5b4nf6d77bc7f9c1b201@mail.gmail.com \
--to=skillzero@gmail.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).