From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Stephen Bash <bash@genarts.com>
Subject: [PATCH 0/2] Teaching -Xours/-Xtheirs to binary ll-merge driver
Date: Sat, 8 Sep 2012 21:40:37 -0700 [thread overview]
Message-ID: <1347165639-12149-1-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <7v392twlnm.fsf@alter.siamese.dyndns.org>
The part that grants Stephen's wish is unchanged from the earlier
"perhaps like this" patch, but this time with a bit of documentation
and test.
A more important change between the two actually is [PATCH 2/2].
When a "binary" synthetic attribute is given to a path, we used to
(1) disable textual diff and (2) disable CR/LF conversion, but it is
also sane to disable the textual merge for a path marked as
"binary", and setting the "-merge" attribute to summon the "binary"
ll-merge driver is the way to do so.
Junio C Hamano (2):
merge: teach -Xours/-Xtheirs to binary ll-merge driver
attr: "binary" attribute should choose built-in "binary" merge driver
Documentation/gitattributes.txt | 2 +-
Documentation/merge-strategies.txt | 3 ++-
attr.c | 2 +-
ll-merge.c | 25 ++++++++++++++++++++-----
t/t6037-merge-ours-theirs.sh | 14 +++++++++++++-
5 files changed, 37 insertions(+), 9 deletions(-)
--
1.7.12.322.g2c7d289
next prev parent reply other threads:[~2012-09-09 4:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1799969825.275125.1347028392272.JavaMail.root@genarts.com>
2012-09-07 14:48 ` Binary file-friendly merge -Xours or -Xtheirs? Stephen Bash
2012-09-07 21:47 ` Junio C Hamano
2012-09-09 4:40 ` Junio C Hamano [this message]
2012-09-09 4:40 ` [PATCH 1/2] merge: teach -Xours/-Xtheirs to binary ll-merge driver Junio C Hamano
2012-09-09 4:40 ` [PATCH 2/2] attr: "binary" attribute should choose built-in "binary" merge driver Junio C Hamano
2012-09-10 14:03 ` Jeff King
2012-09-12 8:55 ` Junio C Hamano
2012-09-12 12:58 ` Stephen Bash
2012-09-12 17:01 ` Junio C Hamano
2012-09-12 17:50 ` Stephen Bash
2012-09-12 13:17 ` Jeff King
2012-09-09 14:30 ` [PATCH 0/2] Teaching -Xours/-Xtheirs to binary ll-merge driver Stephen Bash
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=1347165639-12149-1-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=bash@genarts.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).