Junio C Hamano gits...@pobox.com writes:
Perhaps like this?
I take that your original motivation was to confirm to run a tool on
this particular (as opposed to another) path, but the user can also
take the prompt as to confirm to run this (as opposed to some other)
tool. The latter of
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
On Tue, Apr 22, 2014 at 10:19 AM, Junio C Hamano gits...@pobox.com wrote:
David Aguilar dav...@gmail.com writes:
[Cc:ing Charles in case he has an opinion, this behavior dates back to the
original MT]
On Sun, Apr 20, 2014 at 07:17:34PM -0500, Felipe Contreras wrote:
It's annoying to see
David Aguilar dav...@gmail.com writes:
On Tue, Apr 22, 2014 at 10:19 AM, Junio C Hamano gits...@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
Charles Bailey char...@hashpling.org writes:
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.
Thanks for being careful to help tying the loose ends.
Perhaps like this?
I take
On Mon, Apr 21, 2014 at 09:59:52PM -0700, David Aguilar wrote:
[Cc:ing Charles in case he has an opinion, this behavior dates back to the
original MT]
On Sun, Apr 20, 2014 at 07:17:34PM -0500, Felipe Contreras wrote:
It's annoying to see the prompt:
Hit return to start merge
Charles Bailey wrote:
On Mon, Apr 21, 2014 at 09:59:52PM -0700, David Aguilar wrote:
[Cc:ing Charles in case he has an opinion, this behavior dates back to the
original MT]
On Sun, Apr 20, 2014 at 07:17:34PM -0500, Felipe Contreras wrote:
It's annoying to see the prompt:
Hit
On Tue, Apr 22, 2014 at 01:24:09AM -0500, Felipe Contreras wrote:
This is what I get when a tool is not working:
Documentation/config.txt seems unchanged.
Was the merge successful? [y/n]
Does this happen now even with merge tools for which we do trust the
exit code? If so, my original
Charles Bailey wrote:
On Tue, Apr 22, 2014 at 01:24:09AM -0500, Felipe Contreras wrote:
This is what I get when a tool is not working:
Documentation/config.txt seems unchanged.
Was the merge successful? [y/n]
Does this happen now even with merge tools for which we do trust the
On Tue, Apr 22, 2014 at 01:53:46AM -0500, Felipe Contreras wrote:
Charles Bailey wrote:
On Tue, Apr 22, 2014 at 01:24:09AM -0500, Felipe Contreras wrote:
This is what I get when a tool is not working:
Documentation/config.txt seems unchanged.
Was the merge successful? [y/n]
Charles Bailey wrote:
On Tue, Apr 22, 2014 at 01:53:46AM -0500, Felipe Contreras wrote:
Charles Bailey wrote:
On Tue, Apr 22, 2014 at 01:24:09AM -0500, Felipe Contreras wrote:
This is what I get when a tool is not working:
Documentation/config.txt seems unchanged.
David Aguilar dav...@gmail.com writes:
[Cc:ing Charles in case he has an opinion, this behavior dates back to the
original MT]
On Sun, Apr 20, 2014 at 07:17:34PM -0500, Felipe Contreras wrote:
It's annoying to see the prompt:
Hit return to start merge resolution tool (foo):
Every
David Aguilar dav...@gmail.com writes:
[Cc:ing Charles in case he has an opinion, this behavior dates back to the
original MT]
On Sun, Apr 20, 2014 at 07:17:34PM -0500, Felipe Contreras wrote:
It's annoying to see the prompt:
Hit return to start merge resolution tool (foo):
Every
[Cc:ing Charles in case he has an opinion, this behavior dates back to the
original MT]
On Sun, Apr 20, 2014 at 07:17:34PM -0500, Felipe Contreras wrote:
It's annoying to see the prompt:
Hit return to start merge resolution tool (foo):
Every time the user does 'git mergetool' even if
It's annoying to see the prompt:
Hit return to start merge resolution tool (foo):
Every time the user does 'git mergetool' even if the user already
configured 'foo' as the wanted tool.
Display this prompt only when the user hasn't explicitly configured a
tool.
Signed-off-by: Felipe Contreras
15 matches
Mail list logo