From: Finn Arne Gangstad <finnag@pvv.org>
To: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
"git@vger.kernel.org List" <git@vger.kernel.org>
Subject: Re: [PATCH] Clarify text filter merge conflict reduction docs
Date: Mon, 28 Jun 2010 22:31:29 +0200 [thread overview]
Message-ID: <20100628203128.GA10890@pvv.org> (raw)
In-Reply-To: <0cd82ad22a6f240ebcde0c2f3a437a805dae5668.1277753114.git.eyvind.bernhardsen@gmail.com>
On Mon, Jun 28, 2010 at 09:32:50PM +0200, Eyvind Bernhardsen wrote:
> How does this look?
>
> This commit should really be squashed into the first one in the series.
> Live and learn, next time I'll add new changes in a new commit and put
> it _last_. I'll submit a fixed series once we're happy with the
> documentation.
Looks good I think!
- Finn Arne
next prev parent reply other threads:[~2010-06-28 20:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-27 19:43 [PATCH v4 0/3] CRLF merge conflict reduction, take 4 Eyvind Bernhardsen
2010-06-27 19:43 ` [PATCH v4 1/3] Avoid conflicts when merging branches with mixed normalization Eyvind Bernhardsen
2010-06-28 8:02 ` Finn Arne Gangstad
2010-06-28 19:32 ` [PATCH] Clarify text filter merge conflict reduction docs Eyvind Bernhardsen
2010-06-28 20:31 ` Finn Arne Gangstad [this message]
2010-06-29 16:19 ` Junio C Hamano
2010-06-29 21:18 ` Eyvind Bernhardsen
2010-06-30 17:46 ` Junio C Hamano
2010-06-30 21:32 ` Eyvind Bernhardsen
2010-07-01 3:33 ` Junio C Hamano
2010-06-30 8:20 ` Eyvind Bernhardsen
2010-06-30 15:15 ` Junio C Hamano
2010-06-27 19:43 ` [PATCH v4 2/3] Try normalizing files to avoid delete/modify conflicts when merging Eyvind Bernhardsen
2010-06-27 19:43 ` [PATCH v4 3/3] 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=20100628203128.GA10890@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 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).