mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johannes Schindelin <>
To: Wen Bei Li <>
Subject: Re: [PATCH] mergetools: add support for VS Code
Date: Tue, 4 Jun 2019 15:45:36 +0200 (CEST)	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

Hi Wen Bei Li,

On Mon, 3 Jun 2019, Wen Bei Li wrote:

> Teach difftool and mergetool about VS Code.
> ---

Even if it is a very short commit message (see e.g. for a typical
commit message in Git's repository), I think it is okay.

Personally, I would have "lost" a few words about Visual Studio Code and
how popular it is, but probably only because I like it so much (and maybe
nobody wants to hear about that anymore).

However, in the Git project we do ask for your Sign-off:

> diff --git a/ b/
> index 204a5acd66..59512ae673 100644
> --- a/
> +++ b/
> @@ -283,7 +283,7 @@ list_merge_tool_candidates () {
>  		fi
>  		tools="$tools gvimdiff diffuse diffmerge ecmerge"
>  		tools="$tools p4merge araxis bc codecompare"
> -		tools="$tools smerge"
> +		tools="$tools smerge code"

Do you also want to add support for `code-insiders`? (That's what I run a
lot of the time because it allows me to develop code in my Windows
Subsystem for Linux while the GUI runs on Windows.)

>  	fi
>  	case "${VISUAL:-$EDITOR}" in
>  	*vim*)
> diff --git a/mergetools/code b/mergetools/code
> new file mode 100644
> index 0000000000..566a0d9d63
> --- /dev/null
> +++ b/mergetools/code
> @@ -0,0 +1,7 @@
> +diff_cmd () {
> +	"$merge_tool_path" --wait --diff "$LOCAL" "$REMOTE"
> +}
> +
> +merge_cmd () {
> +	"$merge_tool_path" --wait "$MERGED"
> +}

This looks good to me!


  reply	other threads:[~2019-06-04 13:45 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-03 15:03 [PATCH] mergetools: add support for VS Code Wen Bei Li
2019-06-04 13:45 ` Johannes Schindelin [this message]
2019-06-04 23:21   ` Wen Bei Li
2019-06-05 12:08     ` Johannes Schindelin

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \

* 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.
Code repositories for project(s) associated with this public inbox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).