Re: [PATCH] mergetools: add support for VS Code

2019-06-05 Thread Johannes Schindelin
Hi Wen Bei Li, On Tue, 4 Jun 2019, Wen Bei Li wrote: > Teach difftool and mergetool about VS Code and VS Code Insiders > > Signed-off-by: Wen Bei Li > --- > Hello Johannes, thank you for reviewing my patch. It's the first time > I've done this via email. Heh, I hear you. It makes me happy that

[PATCH] mergetools: add support for VS Code

2019-06-04 Thread Wen Bei Li
Teach difftool and mergetool about VS Code and VS Code Insiders Signed-off-by: Wen Bei Li --- Hello Johannes, thank you for reviewing my patch. It's the first time I've done this via email. I've added `code-insiders` as you suggested, but I wasn't sure if I should send it as a v2. I used this c

Re: [PATCH] mergetools: add support for VS Code

2019-06-04 Thread Johannes Schindelin
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. Personal

[PATCH] mergetools: add support for VS Code

2019-06-03 Thread Wen Bei Li
Teach difftool and mergetool about VS Code. --- git-mergetool--lib.sh | 2 +- mergetools/code | 7 +++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 mergetools/code diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 204a5acd66..59512ae673 100644 --- a