From: Junio C Hamano <gitster@pobox.com>
To: Seth House <seth@eseth.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v8 2/4] mergetool: Add per-tool support for the autoMerge flag
Date: Mon, 28 Dec 2020 05:09:53 -0800 [thread overview]
Message-ID: <xmqqzh1yhyam.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: 20201228045427.1166911-3-seth@eseth.com
> Subject: Re: [PATCH v8 2/4] mergetool: Add per-tool support for the autoMerge flag
"git shortlog --no-merges --since=2.months" may tell you this but our
convention is not to capitalize the word after "<area>:" on the
title.
> Keep the global mergetool flag and add a per-tool override flag so that
> users may enable the flag for one tool and disable it for another.
>
> Signed-off-by: Seth House <seth@eseth.com>
> ---
> Documentation/config/mergetool.txt | 3 +++
> git-mergetool.sh | 5 ++++-
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
> index 7ce6d0d3ac..ef147fc118 100644
> --- a/Documentation/config/mergetool.txt
> +++ b/Documentation/config/mergetool.txt
> @@ -21,6 +21,9 @@ mergetool.<tool>.trustExitCode::
> if the file has been updated, otherwise the user is prompted to
> indicate the success of the merge.
>
> +mergetool.<tool>.autoMerge::
> + Remove lines without conflicts from all the files. Defaults to `true`.
> +
This entry needs to mention how it relates to the big red button
mergetool.autoMerge and vice versa. E.g.
mergetool.autoMerge::
- Remove lines without conflicts from all the files. Defaults to `true`.
+ Remove lines without conflicts from all the files. Can be
+ overriden per-tool via `mergetool.<tool>.autoMerge` configuration
+ variable. Defaults to `true`.
would be a good update to the documentation introduced by the
previous step. It is somewhat misleading for the per-tool entry
added in this patch to say "Defaults to `true`", as the value of the
big red button configuration would be the real default.
Remove ... the files when the mergetool '<tool>' is in use.
See also `mergetool.autoMerge`.
or something like that, perhaps.
next prev parent reply other threads:[~2020-12-28 13:10 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-23 4:53 [PATCH v5 0/1] mergetool: remove unconflicted lines Felipe Contreras
2020-12-23 4:53 ` [PATCH v5 1/1] mergetool: add automerge configuration Felipe Contreras
2020-12-23 13:34 ` Junio C Hamano
2020-12-23 14:23 ` Felipe Contreras
2020-12-23 20:21 ` Junio C Hamano
2020-12-24 0:14 ` Felipe Contreras
2020-12-24 0:32 ` Junio C Hamano
2020-12-24 1:36 ` Felipe Contreras
2020-12-24 6:17 ` Junio C Hamano
2020-12-24 15:59 ` Felipe Contreras
2020-12-24 22:32 ` Junio C Hamano
2020-12-27 18:01 ` Felipe Contreras
2020-12-24 9:24 ` [PATCH v5 0/1] mergetool: remove unconflicted lines Junio C Hamano
2020-12-24 16:16 ` Felipe Contreras
2020-12-30 5:47 ` Johannes Schindelin
2020-12-30 22:33 ` Felipe Contreras
2020-12-27 20:58 ` [PATCH v6 0/1] mergetool: add automerge configuration Seth House
2020-12-27 20:58 ` [PATCH v6 1/2] " Seth House
2020-12-27 22:06 ` Junio C Hamano
2020-12-27 22:29 ` Seth House
2020-12-27 22:59 ` Junio C Hamano
2020-12-27 20:58 ` [PATCH v6 2/2] mergetool: Add per-tool support for the autoMerge flag Seth House
2020-12-27 22:31 ` Junio C Hamano
2020-12-28 0:41 ` [PATCH v7 0/2] mergetool: add automerge configuration Seth House
2020-12-28 0:41 ` [PATCH v7 1/2] " Seth House
2020-12-28 0:41 ` [PATCH v7 2/2] mergetool: Add per-tool support for the autoMerge flag Seth House
2020-12-28 1:18 ` Felipe Contreras
2020-12-28 4:54 ` [PATCH v8 0/4] mergetool: add automerge configuration Seth House
2020-12-28 4:54 ` [PATCH v8 1/4] " Seth House
2020-12-28 11:30 ` Johannes Sixt
2020-12-28 4:54 ` [PATCH v8 2/4] mergetool: Add per-tool support for the autoMerge flag Seth House
2020-12-28 13:09 ` Junio C Hamano [this message]
2020-12-28 4:54 ` [PATCH v8 3/4] mergetool: Break setup_tool out into separate initialization function Seth House
2020-12-28 11:48 ` Johannes Sixt
2020-12-28 4:54 ` [PATCH v8 4/4] mergetool: Add automerge_enabled tool-specific override function Seth House
2020-12-28 11:57 ` Johannes Sixt
2020-12-28 13:19 ` Junio C Hamano
2020-12-28 19:29 ` [PATCH v9 0/5] mergetool: add automerge configuration Seth House
2020-12-28 19:29 ` [PATCH v9 1/5] " Seth House
2020-12-28 19:29 ` [PATCH v9 2/5] mergetool: alphabetize the mergetool config docs Seth House
2020-12-28 19:29 ` [PATCH v9 3/5] mergetool: add per-tool support for the autoMerge flag Seth House
2020-12-28 19:29 ` [PATCH v9 4/5] mergetool: break setup_tool out into separate initialization function Seth House
2020-12-29 8:50 ` Johannes Sixt
2020-12-29 17:23 ` Seth House
2020-12-28 19:29 ` [PATCH v9 5/5] mergetool: add automerge_enabled tool-specific override function Seth House
2020-12-29 2:01 ` Felipe Contreras
2021-01-06 5:55 ` Junio C Hamano
2021-01-07 3:58 ` Seth House
2021-01-07 6:38 ` Junio C Hamano
2021-01-07 9:27 ` Seth House
2021-01-07 21:26 ` Junio C Hamano
2021-01-08 15:04 ` Johannes Schindelin
2021-01-30 5:46 ` [PATCH v10 0/3] mergetool: add hideResolved configuration (was automerge) Seth House
2021-01-30 5:46 ` [PATCH v10 1/3] mergetool: add hideResolved configuration Seth House
2021-01-30 8:08 ` Junio C Hamano
2021-01-30 5:46 ` [PATCH v10 2/3] mergetool: break setup_tool out into separate initialization function Seth House
2021-01-30 5:46 ` [PATCH v10 3/3] mergetool: add per-tool support and overrides for the hideResolved flag Seth House
2021-01-30 8:08 ` Junio C Hamano
2021-02-09 20:07 ` [PATCH v11 0/3] mergetool: add hideResolved configuration (was automerge) Seth House
2021-02-09 20:07 ` [PATCH v11 1/3] mergetool: add hideResolved configuration Seth House
2021-03-09 2:29 ` [PATCH] mergetool: do not enable hideResolved by default Jonathan Nieder
2021-03-09 5:42 ` Seth House
2021-03-10 1:23 ` Jonathan Nieder
2021-03-10 8:06 ` Junio C Hamano
2021-03-11 1:57 ` Junio C Hamano
2021-03-12 23:12 ` Junio C Hamano
2021-03-12 23:29 ` Jonathan Nieder
2021-03-12 23:36 ` Junio C Hamano
2021-03-13 8:36 ` [PATCH v2 0/2] " Jonathan Nieder
2021-03-13 8:38 ` [PATCH 1/2] " Jonathan Nieder
2021-03-13 8:41 ` [PATCH 2/2] doc: describe mergetool configuration in git-mergetool(1) Jonathan Nieder
2021-03-13 23:34 ` Junio C Hamano
2021-03-13 23:37 ` Junio C Hamano
2021-02-09 20:07 ` [PATCH v11 2/3] mergetool: break setup_tool out into separate initialization function Seth House
2021-02-09 20:07 ` [PATCH v11 3/3] mergetool: add per-tool support and overrides for the hideResolved flag Seth House
2021-02-09 22:11 ` [PATCH v11 0/3] mergetool: add hideResolved configuration (was automerge) Junio C Hamano
2021-02-09 23:27 ` Seth House
2020-12-28 10:29 ` [PATCH v7 0/2] mergetool: add automerge configuration Junio C Hamano
2020-12-28 14:40 ` Felipe Contreras
2020-12-28 1:02 ` [PATCH v6 0/1] " Felipe Contreras
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=xmqqzh1yhyam.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=seth@eseth.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).