public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Phillip Wood <phillip.wood123@gmail•com>
To: rsbecker@nexbridge•com, 'Johannes Sixt' <j6t@kdbg•org>
Cc: git@vger•kernel.org, Junio C Hamano <gitster@pobox•com>
Subject: Re: [QUESTION] mergetool environment variables
Date: Sun, 14 Sep 2025 14:48:45 +0100	[thread overview]
Message-ID: <a57d5857-b096-4d92-993a-3f09d15cdcb9@gmail.com> (raw)
In-Reply-To: <004101dc250d$18173950$4845abf0$@nexbridge.com>

Hi Randall

On 14/09/2025 01:18, rsbecker@nexbridge•com wrote:
> On September 13, 2025 5:04 PM, Johannes Sixt wrote:
>> To: rsbecker@nexbridge•com
>> Cc: git@vger•kernel.org
>> Subject: Re: [QUESTION] mergetool environment variables
>>
>> Am 13.09.25 um 16:42 schrieb rsbecker@nexbridge•com:
>>> Let me try to infer what is happening and please correct me if my
>>> assumptions are wrong:
>> I'm sorry to say that I can't help. I tried to disentangle what is going on, but this
>> stuff is far too convoluted to be understood in a few minutes. I cannot tell if it is
>> possible to write a mergetool that is not installed with Git.
>>
>> I would just copy one of the existing tool scripts and run `make install` from the Git
>> source directory.
> 
> Yes, it needs to be in the git install area. Adding export BASE export LOCAL, etc.,
> works to resolve the situation. I wonder whether that should be documented.

Looking at t7610-mergetool.sh I think you can use mergetool.<tool>.cmd 
to call a user defined merge tool. The value of the config variable is 
eval'd in the shell so if you run

     git config mergetool.my-tool.cmd 'my-tool "$BASE" "$LOCAL" "$REMOTE"'

then

     git mergetool --tool=my-tool

will run

     my-tool <base-file> <local-file> <remote-file>

on each unmerged file

Thanks

Phillip

next prev parent reply	other threads:[~2025-09-14 13:48 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-12 20:16 [QUESTION] mergetool environment variables rsbecker
2025-09-13  7:04 ` Johannes Sixt
2025-09-13 14:42   ` rsbecker
2025-09-13 21:03     ` Johannes Sixt
2025-09-14  0:18       ` rsbecker
2025-09-14  6:38         ` Junio C Hamano
2025-09-14 13:48         ` Phillip Wood [this message]
2025-09-15 15:35           ` D. Ben Knoble

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=a57d5857-b096-4d92-993a-3f09d15cdcb9@gmail.com \
    --to=phillip.wood123@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitster@pobox$(echo .)com \
    --cc=j6t@kdbg$(echo .)org \
    --cc=phillip.wood@dunelm$(echo .)org.uk \
    --cc=rsbecker@nexbridge$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox