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. https://github.com/git-for-windows/git/commit/581d2fd9f2d6 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: https://git-scm.com/docs/SubmittingPatches#dco > diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh > index 204a5acd66..59512ae673 100644 > --- a/git-mergetool--lib.sh > +++ b/git-mergetool--lib.sh > @@ -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! Thanks, Johannes
