All of lore.kernel.org
 help / color / mirror / Atom feed
From: Seth House <seth@eseth.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: David Aguilar <davvid@gmail.com>,
	Felipe Contreras <felipe.contreras@gmail.com>,
	"brian m. carlson" <sandals@crustytoothpaste.net>,
	git@vger.kernel.org
Subject: Re: Re* [PATCH v2] fixup! mergetool: add automerge configuration
Date: Sun, 10 Jan 2021 00:29:02 -0700	[thread overview]
Message-ID: <20210110072902.GA247325@ellen> (raw)
In-Reply-To: <xmqqa6thcn1n.fsf_-_@gitster.c.googlers.com>

On Sat, Jan 09, 2021 at 10:40:20PM -0800, Junio C Hamano wrote:
> An ugly workaround patch that caters only to difftool breakage is
> attached at the end; I did not look if a similar treatment is
> necessary for the mergetool side.

That fixup does the trick on my machine too. Thank you.

How wary are you of continuing with `initialize_merge_tool`? Do you see
a better approach to get `automerge_enabled `into scope? While it is
a nice feature to have, is it worth the risk vs. reward?


  reply	other threads:[~2021-01-10  7:32 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-09 21:49 [PATCH] fixup! mergetool: add automerge configuration David Aguilar
2021-01-09 21:59 ` brian m. carlson
2021-01-09 22:42   ` [PATCH v2] " David Aguilar
2021-01-09 22:54     ` Seth House
2021-01-10  1:17       ` Junio C Hamano
2021-01-10  6:40         ` Re* " Junio C Hamano
2021-01-10  7:29           ` Seth House [this message]
2021-01-10 11:24             ` Junio C Hamano
2021-01-16  4:24               ` Seth House
2021-01-20 23:24                 ` automerge implementation ideas for Windows Seth House
2021-01-21 22:50                   ` Junio C Hamano
2021-01-22  1:09                     ` Seth House
2021-01-22  2:26                       ` Junio C Hamano
2021-01-22  2:50                 ` Re* [PATCH v2] fixup! mergetool: add automerge configuration brian m. carlson
2021-01-22 16:29                   ` Johannes Schindelin
2021-01-22 23:25                     ` brian m. carlson
2021-01-26 14:32                       ` Johannes Schindelin
2021-01-26 18:06                         ` Seth House
2021-01-26 20:10                           ` Junio C Hamano
2021-01-27  3:37                             ` Seth House
2021-01-29  0:41                               ` Junio C Hamano
2021-01-09 23:18     ` Junio C Hamano
2021-01-10  1:52       ` Junio C Hamano
2021-01-09 23:21   ` [PATCH] " Junio C Hamano
2021-01-22  9:08 Re* [PATCH v2] " Seth House

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=20210110072902.GA247325@ellen \
    --to=seth@eseth.com \
    --cc=davvid@gmail.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=sandals@crustytoothpaste.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. 
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.