All of lore.kernel.org
 help / color / mirror / Atom feed
From: Charles Bailey <charles@hashpling.org>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: David Aguilar <davvid@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH 2/2] mergetool: run prompt only if guessed tool
Date: Wed, 23 Apr 2014 08:56:01 +0100	[thread overview]
Message-ID: <20140423075601.GA18585@hashpling.org> (raw)
In-Reply-To: <535620a6e8274_3d2216372ec9d@nysa.notmuch>

On Tue, Apr 22, 2014 at 02:56:22AM -0500, Felipe Contreras wrote:
> An explicitly set mergetool.prompt = true would override the default. See the
> patch.

I have had a chance to test the patch now and it looks good. I think
when glancing at it before I missed the change that dropped "|| echo
true" from 

prompt=$(git config --bool mergetool.prompt || echo true)

so I wasn't sure where the implicit true / explicit true difference was
handled.

> I looked, the documentation doesn't mention any default. We could add it, but I
> don't think it's necesarily part of this patch.

The bit of documentation that I was thinking of is in
Documentation/git-mergetool.txt where it states that "--prompt" is the
default which is now only partially true.

  reply	other threads:[~2014-04-23  7:56 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-21  0:17 [PATCH 0/2] Simple default fixes for v2.0 Felipe Contreras
2014-04-21  0:17 ` [PATCH 1/2] merge: enable defaulttoupstream by default Felipe Contreras
2014-04-22 19:53   ` Junio C Hamano
2014-04-21  0:17 ` [PATCH 2/2] mergetool: run prompt only if guessed tool Felipe Contreras
2014-04-22  4:59   ` David Aguilar
2014-04-22  6:01     ` Charles Bailey
2014-04-22  6:24       ` Felipe Contreras
2014-04-22  6:55         ` Charles Bailey
2014-04-22  6:53           ` Felipe Contreras
2014-04-22  7:30             ` Charles Bailey
2014-04-22  7:56               ` Felipe Contreras
2014-04-23  7:56                 ` Charles Bailey [this message]
2014-04-23 17:07                   ` Junio C Hamano
2014-04-24 18:30                     ` Junio C Hamano
2014-04-22 17:19     ` Junio C Hamano
2014-04-23  7:58       ` David Aguilar
2014-04-23 16:52         ` Junio C Hamano
2014-04-22 17:32     ` Junio C Hamano
2014-04-22 19:55       ` Junio C Hamano

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=20140423075601.GA18585@hashpling.org \
    --to=charles@hashpling.org \
    --cc=davvid@gmail.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    /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.