From: Junio C Hamano <gitster@pobox.com>
To: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Cc: git@vger.kernel.org
Subject: Re: core.autocrlf and merge conflict output
Date: Sun, 22 Jun 2008 18:54:24 -0700 [thread overview]
Message-ID: <7vk5ggkjan.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <g3mvbh$mmj$1@ger.gmane.org> (Edward Z. Yang's message of "Sun, 22 Jun 2008 21:47:36 -0400")
"Edward Z. Yang" <edwardzyang@thewritingpot.com> writes:
> Junio C Hamano wrote:
>> Is this an old news before 249c61a (merge-recursive: respect core.autocrlf
>> when writing out the result, 2008-06-09) happened?
>
> Apparently, yes. :o) Thus are the perils of working off a "downstream"
> branch. I'll go bug the git/mingw/4msysgit.git maintainers to get this
> change merged in. Thanks!
Did cherry-picking that particular commit locally fixes the issue for you?
next prev parent reply other threads:[~2008-06-23 1:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-22 22:08 core.autocrlf and merge conflict output Edward Z. Yang
2008-06-23 0:45 ` Junio C Hamano
2008-06-23 1:47 ` Edward Z. Yang
2008-06-23 1:54 ` Junio C Hamano [this message]
2008-06-23 2:00 ` Johannes Schindelin
2008-06-23 2:23 ` Edward Z. Yang
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=7vk5ggkjan.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=edwardzyang@thewritingpot.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).