From: Finn Arne Gangstad <finnag@pvv.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Subject: Re: What's cooking in git.git (Jul 2010, #01; Wed, 7)
Date: Thu, 8 Jul 2010 14:27:16 +0200 [thread overview]
Message-ID: <20100708122716.GA2193@pvv.org> (raw)
In-Reply-To: <7vlj9msve4.fsf@alter.siamese.dyndns.org>
On Wed, Jul 07, 2010 at 04:51:47PM -0700, Junio C Hamano wrote:
> * eb/double-convert-before-merge (2010-07-02) 3 commits
> - Don't expand CRLFs when normalizing text during merge
> - Try normalizing files to avoid delete/modify conflicts when merging
> - Avoid conflicts when merging branches with mixed normalization
Any hopes of getting this in soonish? Since this now is "opt-in", and
helps tremendously if you are adding the new text/eol attributes, it
would be helpful to see it in the same release as the new attributes.
- Finn Arne
prev parent reply other threads:[~2010-07-08 12:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-07 23:51 What's cooking in git.git (Jul 2010, #01; Wed, 7) Junio C Hamano
2010-07-08 0:22 ` Ævar Arnfjörð Bjarmason
2010-07-08 12:27 ` Finn Arne Gangstad [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=20100708122716.GA2193@pvv.org \
--to=finnag@pvv.org \
--cc=eyvind.bernhardsen@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.