From: Junio C Hamano <gitster@pobox.com>
To: David Aguilar <davvid@gmail.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Charles Bailey <charles@hashpling.org>
Subject: Re: [PATCH 2/2] mergetool: run prompt only if guessed tool
Date: Wed, 23 Apr 2014 09:52:09 -0700 [thread overview]
Message-ID: <xmqqppk80z0m.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAJDDKr5P7crudFiAa7Lu4CYmDWgZ-drdkiOfusFHioTF9co2Nw@mail.gmail.com> (David Aguilar's message of "Wed, 23 Apr 2014 00:58:51 -0700")
David Aguilar <davvid@gmail.com> writes:
> On Tue, Apr 22, 2014 at 10:19 AM, Junio C Hamano <gitster@pobox.com> wrote:
> ...
>> Thanks for CC'ing Charles, by the way. I think his point about
>> mentioning the change of default somewhere in the documentation
>> has some merits, and it can be done in a follow-up patch on top.
>
> Another thing that crossed my mind is that we have -y for --no-prompt
> because --prompt was the original default. Maybe a -i (?) shortcut for
> the interactive --prompt can be added to make the "need to skip some
> when resolving" use case easier to activate.
Hmm, perhaps, but is "do we prompt to give a chance to the user to
say 'no, I am not interested in running the tool to that path'" the
only interactivity in the overall end-user experience in using the
mergetool? To end-users, both interaction with the mergetool
front-end and interaction with individual back-end taken together
would comprise the whole end-user experience, so "--interactive"
option that is implied by "-i" short-cut may make them expect a
behaviour from the backend that is more interactive than without,
which would not be the case, so....
next prev parent reply other threads:[~2014-04-23 16:53 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
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 [this message]
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=xmqqppk80z0m.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=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.