From: Steven Grimm <koreth@midwinter.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] Ignore end-of-line style when computing similarity score for rename detection
Date: Thu, 28 Jun 2007 11:17:09 -0700 [thread overview]
Message-ID: <4683FB25.3080204@midwinter.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0706281340090.4438@racer.site>
Johannes Schindelin wrote:
> Somehow I think that this should be triggered by "--ignore-space-at-eol",
> _and_ be accompanied by a test case.
>
Should --ignore-space-at-eol be an option to git-merge? Merges are where
this functionality matters; for simple diffs, --ignore-space-at-eol
actually already covers it. If we allow that option, should we also
allow other git-diff options like --ignore-all-space and
--ignore-space-change? What are the semantics of an autoresolved merge
with those options in effect -- are they only used for rename detection,
or do we, e.g., not flag conflicts with only whitespace changes? And if
we don't, which version do we accept automatically?
-Steve
next prev parent reply other threads:[~2007-06-28 18:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-28 2:39 [PATCH] Ignore end-of-line style when computing similarity score for rename detection Steven Grimm
2007-06-28 2:46 ` Steven Grimm
2007-06-28 7:22 ` Johannes Sixt
2007-06-28 8:16 ` Junio C Hamano
2007-06-28 4:29 ` Junio C Hamano
2007-06-28 6:04 ` Steven Grimm
2007-06-28 6:18 ` Shawn O. Pearce
2007-06-29 6:34 ` Junio C Hamano
2007-06-28 12:41 ` Johannes Schindelin
2007-06-28 18:17 ` Steven Grimm [this message]
2007-06-29 10:19 ` Johannes Schindelin
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=4683FB25.3080204@midwinter.com \
--to=koreth@midwinter.com \
--cc=Johannes.Schindelin@gmx.de \
--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.