From: Anton Trunov <anton.a.trunov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, jrnieder@gmail.com, tboegi@web.de,
sunshine@sunshineco.com, charles@hashpling.org,
Johannes.Schindelin@gmx.de
Subject: Re: [PATCH] xmerge.c: fix xdl_merge to conform with the manual
Date: Fri, 06 Mar 2015 11:02:45 +0300 [thread overview]
Message-ID: <54F95F25.9090300@gmail.com> (raw)
In-Reply-To: <xmqqfv9k8rcs.fsf@gitster.dls.corp.google.com>
On 04/03/15 23:01, Junio C Hamano wrote:
> []
My apologies for pushing this topic, but what would you recommend?
Should we treat both sides line-wise or should we correct the documentation?
Current version for git help merge:
...
ignore-space-change, ignore-all-space, ignore-space-at-eol
Treats lines with the indicated type of whitespace change as
unchanged for the sake of a three-way merge. Whitespace
changes mixed with other changes to a line are not ignored. See also
git-diff(1)-b, -w, and --ignore-space-at-eol.
o If their version only introduces whitespace changes to a line,
our version is used;
o If our version introduces whitespace changes but their version
includes a substantial change, their version is used;
o Otherwise, the merge proceeds in the usual way.
...
The 1st bullet point could be changed into
o If their version only introduces whitespace changes to *all
changed lines*, our version is used;
And the 2nd one into:
o If our version only introduces whitespace changes to all changed
lines, but their version includes at least one substantially changed
line, all lines from their version are used;
next prev parent reply other threads:[~2015-03-06 8:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-03 17:37 [PATCH] xmerge.c: fix xdl_merge to conform with the manual Anton Trunov
2015-03-03 20:17 ` Torsten Bögershausen
2015-03-04 7:07 ` Eric Sunshine
2015-03-04 9:55 ` Anton Trunov
2015-03-04 10:01 ` Eric Sunshine
2015-03-04 9:59 ` Anton Trunov
2015-03-03 20:32 ` Junio C Hamano
2015-03-04 9:43 ` Anton Trunov
2015-03-04 20:01 ` Junio C Hamano
2015-03-05 9:50 ` Anton Trunov
2015-03-06 8:02 ` Anton Trunov [this message]
2015-03-08 8:06 ` Junio C Hamano
2015-03-09 10:07 ` Anton Trunov
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54F95F25.9090300@gmail.com \
--to=anton.a.trunov@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=tboegi@web.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).