From: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "git@vger.kernel.org List" <git@vger.kernel.org>
Subject: [PATCH v5 0/4] Re-rolled merge normalization
Date: Thu, 1 Jul 2010 11:09:48 +0200 [thread overview]
Message-ID: <cover.1277974452.git.eyvind.bernhardsen@gmail.com> (raw)
Hi Junio,
I took the liberty of re-rolling my series with your improved d/m patch.
I re-added some optimizations to your patch and renamed the config
variable to something a little more typeable.
--
Eyvind
Eyvind Bernhardsen (3):
Avoid conflicts when merging branches with mixed normalization
Try normalizing files to avoid delete/modify conflicts when merging
Don't expand CRLFs when normalizing text during merge
Junio C Hamano (1):
Introduce "double conversion during merge" more gradually
Documentation/config.txt | 10 ++++++
Documentation/gitattributes.txt | 34 ++++++++++++++++++++++
cache.h | 2 +
config.c | 5 +++
convert.c | 37 ++++++++++++++++++++----
environment.c | 1 +
ll-merge.c | 15 ++++++++++
merge-recursive.c | 51 ++++++++++++++++++++++++++++++++-
t/t6038-merge-text-auto.sh | 59 +++++++++++++++++++++++++++++++++++++++
9 files changed, 206 insertions(+), 8 deletions(-)
create mode 100755 t/t6038-merge-text-auto.sh
--
1.7.2.rc1.4.g09d06
next reply other threads:[~2010-07-01 9:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-01 9:09 Eyvind Bernhardsen [this message]
2010-07-01 9:09 ` [PATCH v5 1/4] Avoid conflicts when merging branches with mixed normalization Eyvind Bernhardsen
2010-07-01 9:09 ` [PATCH v5 2/4] Introduce "double conversion during merge" more gradually Eyvind Bernhardsen
2010-07-01 10:19 ` Johannes Sixt
2010-07-01 16:25 ` Junio C Hamano
2010-07-01 16:41 ` Eyvind Bernhardsen
2010-07-01 17:05 ` Jakub Narebski
2010-07-01 18:57 ` Finn Arne Gangstad
2010-07-01 20:15 ` Jakub Narebski
2010-07-01 20:25 ` Eyvind Bernhardsen
2010-07-01 20:13 ` Eyvind Bernhardsen
2010-07-01 9:09 ` [PATCH v5 3/4] Try normalizing files to avoid delete/modify conflicts when merging Eyvind Bernhardsen
2010-07-01 9:09 ` [PATCH v5 4/4] Don't expand CRLFs when normalizing text during merge Eyvind Bernhardsen
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=cover.1277974452.git.eyvind.bernhardsen@gmail.com \
--to=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 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).