From: Junio C Hamano <gitster@pobox.com>
To: Alexander Gavrilov <angavrilov@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH (BUGFIX)] Respect core.autocrlf in combined diff
Date: Sat, 23 Aug 2008 17:56:56 -0700 [thread overview]
Message-ID: <7vej4fw7qf.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <200808232321.21795.angavrilov@gmail.com> (Alexander Gavrilov's message of "Sat, 23 Aug 2008 23:21:21 +0400")
Alexander Gavrilov <angavrilov@gmail.com> writes:
> Steps to reproduce:
>
> git init
> echo foo > file
> git add file
> git commit -m init
> git checkout -b a
> git checkout -b b
> echo bbb >> file
> git add file
> git commit -m bbb
> git checkout a
> echo aaa >> file
> git add file
> git commit -m aaa
> git config core.autocrlf true
> git merge b
Please add this kind of sequence to test scripts.
The patch from a cursory look appears correct. Thanks.
next prev parent reply other threads:[~2008-08-24 0:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-23 19:21 [PATCH (BUGFIX)] Respect core.autocrlf in combined diff Alexander Gavrilov
2008-08-24 0:56 ` Junio C Hamano [this message]
2008-08-24 1:24 ` Junio C Hamano
2008-08-24 9:21 ` Alexander Gavrilov
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=7vej4fw7qf.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=angavrilov@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).