From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: phillip.wood@talktalk.net, git <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)
Date: Thu, 11 Oct 2018 16:06:32 -0700 [thread overview]
Message-ID: <CAGZ79ka1pxPt+xT3vBa5xARG5P+Hd19sjOLO_y_zofVStsDWNQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqa7nkf6o4.fsf@gitster-ct.c.googlers.com>
On Thu, Oct 11, 2018 at 3:41 PM Junio C Hamano <gitster@pobox.com> wrote:
> * After fixing ignore-any to one of the supported option
> (e.g. "ignore-all-spaces"), the color-moved feature still did not
> trigger. I think the presence of --color-moved-ws by itself is a
> hint that the user wants --color-moved to be used. If it turns
> out that there are some valid use cases where --color-moved-ws
> may have to be set but the color-moved feature should not be
> enabled, then
>
> diff --color-moved-ws=ignore-all-space --no-color-moved
>
> can be used to countermand this, of course.
I had the same idea for --color-moved to imply --color, but there
we had some issues with configured settings, as we do not want
diff.colorMoved to imply colored patches, but only when given on
the command line.
I think we should add these tweaks, such that
color-moved-ws implies color-moved (both config and CLI options)
and --color-moved implies --color (command line only)
next prev parent reply other threads:[~2018-10-11 23:06 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-10 5:43 What's cooking in git.git (Oct 2018, #01; Wed, 10) Junio C Hamano
2018-10-10 7:59 ` Ævar Arnfjörð Bjarmason
2018-10-10 15:06 ` Jeff King
2018-10-10 12:57 ` builtin stash/rebase, was " Johannes Schindelin
2018-10-10 13:19 ` Junio C Hamano
2018-10-11 2:18 ` Junio C Hamano
2018-10-10 13:04 ` js/mingw-wants-vista-or-above, " Johannes Schindelin
2018-10-10 13:13 ` Junio C Hamano
2018-10-10 13:58 ` Phillip Wood
2018-10-11 1:54 ` Junio C Hamano
2018-10-11 22:40 ` Junio C Hamano
2018-10-11 22:59 ` [PATCH] diff.c: die on unknown color-moved ws mode Stefan Beller
2018-10-11 23:01 ` Stefan Beller
2018-10-12 1:22 ` Junio C Hamano
2018-10-11 23:06 ` Stefan Beller [this message]
2018-10-12 0:51 ` What's cooking in git.git (Oct 2018, #01; Wed, 10) Junio C Hamano
2018-10-12 9:59 ` Phillip Wood
2018-10-12 13:36 ` Junio C Hamano
2018-10-16 13:38 ` Phillip Wood
2018-10-16 17:13 ` Stefan Beller
2018-10-10 14:18 ` Thomas Gummerer
2018-10-11 1:40 ` Junio C Hamano
2018-10-10 18:51 ` `--rebase-merges' still failing badly Michael Witten
2018-10-10 19:00 ` Michael Witten
2018-10-10 23:01 ` Junio C Hamano
2018-10-11 2:44 ` Michael Witten
2018-10-12 9:11 ` Johannes Schindelin
2018-10-10 18:55 ` What's cooking in git.git (Oct 2018, #01; Wed, 10) Stefan Beller
2018-10-11 2:00 ` Junio C Hamano
2018-10-10 20:38 ` Tim Schumacher
2018-10-10 21:25 ` Johannes Sixt
2018-10-11 1:53 ` Junio C Hamano
2018-10-11 11:16 ` Derrick Stolee
2018-10-14 12:21 ` Duy Nguyen
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=CAGZ79ka1pxPt+xT3vBa5xARG5P+Hd19sjOLO_y_zofVStsDWNQ@mail.gmail.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@talktalk.net \
/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).