On Thu, May 9, 2013 at 10:41 PM, Charles Bailey char...@hashpling.org wrote:
On Thu, May 09, 2013 at 03:17:30PM -0700, David Aguilar wrote:
Generally, mergetool.tool.cmd is not general enough since we've
always special cased the base vs. no-base code paths and we run
different commands
David Aguilar dav...@gmail.com writes:
Marked RFC because I am kinda against adding more configuration
variables.
Just like git merge has -Xoption escape hatch to allow us to
pass backend-specific options, perhaps you can add a mechanism to
git mergetool to let the user pass --no-auto from the
On Thu, May 09, 2013 at 09:10:51AM -0700, Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
Marked RFC because I am kinda against adding more configuration
variables.
Just like git merge has -Xoption escape hatch to allow us to
pass backend-specific options, perhaps you can
On Thu, May 9, 2013 at 12:15 PM, Junio C Hamano gits...@pobox.com wrote:
John Keeping j...@keeping.me.uk writes:
On Thu, May 09, 2013 at 09:10:51AM -0700, Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
Marked RFC because I am kinda against adding more configuration
On Thu, May 09, 2013 at 03:17:30PM -0700, David Aguilar wrote:
Generally, mergetool.tool.cmd is not general enough since we've
always special cased the base vs. no-base code paths and we run
different commands depending on whether a base is available.
Then this is a deficiency of the .cmd
5 matches
Mail list logo