blocks|key|134408|text|我不确定您是否能做到这一点，但是您可以尝试在gitconfig文件中添加这些内容。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|134409|尝试替换这些值中的kdiff3以指向visual+studio代码可执行文件。|134410|+`[merge]+++++++++tool+=+kdiff3+++++[mergetool+"kdiff3"]+++++++++path+=+C:/Program+Files/KDiff3/kdiff3.exe+++++++++keepBackup+=+false+++++++++trustExitCode+=+false`|code-block|syntax|javascript|134411|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|L|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|M|8|@]|9|@]|A|$G|H]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

Im not sure you can do this, however you can try these additions in your gitconfig file. 

Try to replace the kdiff3 from these values to point to visual studio code executable.

<code>
 [merge]
 tool = kdiff3
 [mergetool "kdiff3"]
 path = C:/Program Files/KDiff3/kdiff3.exe
 keepBackup = false
 trustExitCode = false
</code>

blocks|key|136706|text|我打开我的.gitconfig并修改为：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|136707|[core]
++++editor+=+'C:/Users/miqid/AppData/Local/Code/app-0.1.0/Code.exe'|code-block|syntax|javascript|136708|这为我做到了(我使用的是Windows+8)。|136709|然而，我注意到，在我尝试了一个任意的git+commit之后，在我的Git+Bash控制台中，我看到了以下消息：|BOLD|136710|[9168:0504/160114:INFO:renderer_main.cc(212)]+Renderer+process+started|136711|不确定这可能会有什么后果。|136712|entityMap^0|5|A|0|0|0|I|A|Y|8|0|0|0^^$0|@$1|2|3|4|5|6|7|V|8|@$9|W|A|X|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|Y|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|Z|8|@]|D|@]|E|$]]|$1|M|3|N|5|6|7|10|8|@$9|11|A|12|B|C]|$9|13|A|14|B|O]]|D|@]|E|$]]|$1|P|3|Q|5|H|7|15|8|@]|D|@]|E|$I|J]]|$1|R|3|S|5|6|7|16|8|@]|D|@]|E|$]]|$1|T|3|-4|5|6|7|17|8|@]|D|@]|E|$]]]|U|$]]

I opened up my <code>.gitconfig</code> and amended it with:

<pre><code>[core]
 editor = 'C:/Users/miqid/AppData/Local/Code/app-0.1.0/Code.exe'
</code></pre>

That did it for me (I'm on Windows 8).

However, I noticed that after I tried an arbitrary <code>git commit</code> that in my Git Bash console I see the following message:

<pre><code>[9168:0504/160114:INFO:renderer_main.cc(212)] Renderer process started
</code></pre>

Unsure of what the ramifications of this might be.

blocks|key|2703272|text|GitPad将当前的文本编辑器设置为默认编辑器。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|2703273|我在Windows10中对.txt文件的默认编辑器是Visual+Studio+Code，运行GitPad曾经使它成为Git的默认编辑器。我还没有遇到问题中提到的问题(在我的例子中，Git等待VS+Code窗口关闭)。|style|CODE|2703274|(+.exe文件的链接对我不起作用，您可能需要自己编译源代码。)|2703275|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/github/GitPad^0|0|6|0|0|D|4|0|2|4|0^^$0|@$1|2|3|4|5|6|7|R|8|@]|9|@$A|S|B|T|1|U]]|C|$]]|$1|D|3|E|5|6|7|V|8|@$A|W|B|X|F|G]]|9|@]|C|$]]|$1|H|3|I|5|6|7|Y|8|@$A|Z|B|10|F|G]]|9|@]|C|$]]|$1|J|3|-4|5|6|7|11|8|@]|9|@]|C|$]]]|K|$L|$5|M|N|O|C|$P|Q]]]]

<a href="https://github.com/github/GitPad" rel="nofollow">GitPad</a> sets your current text editor as the default editor for Git.

My default editor for <code>.txt</code> files in Windows 10 is Visual Studio Code and running GitPad once made it the default editor for Git. I haven't experienced the problems mentioned in the question (Git waits until VS Code window is closed in my case).

(The link for the <code>.exe</code> file didn't work for me, you may need to compile the source yourself.)

blocks|key|136729|text|我将Visual+Studio+Code设置为打开.txt文件的默认设置。接下来，我使用了简单的命令：git+config+--global+core.editor+"'C:\Users\UserName\AppData\Local\Code\app-0.7.10\Code.exe\'"。而且一切都运行得很好。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|136730|entityMap^0|1F|2L|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|K|8|@]|D|@]|E|$]]]|G|$]]

I set up Visual Studio Code as a default to open .txt file. And next I did use simple command: <code>git config --global core.editor "'C:\Users\UserName\AppData\Local\Code\app-0.7.10\Code.exe\'"</code>. And everything works pretty well.

blocks|key|2915737|text|据我所知，VSCode已经不在AppData中了。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2915738|因此，通过在命令提示符窗口中执行该命令来设置默认git编辑器：|2915739|git+config+--global+core.editor+"'C:\Program+Files+(x86)\Microsoft+VS+Code\code.exe'+-w"|code-block|syntax|javascript|2915740|参数-w，--wait是等待窗口关闭后再返回。Visual+Studio代码是基于Atom编辑器的。如果您还安装了atom，请执行命令atom+--help。您将在帮助中看到最后一个参数是wait。|offset|length|style|CODE|2915741|下次你做git+rebase+-i+HEAD~3时，它将弹出Visual+Studio+Code。一旦VSCode接近，Git就会夺回领先地位。|2915742|注意:我当前的VSCode版本是0.9.2|2915743|我希望这能有所帮助。|2915744|entityMap^0|0|0|0|2|2|5|6|1V|B|0|4|K|0|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|X|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|Y|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|Z|8|@$K|10|L|11|M|N]|$K|12|L|13|M|N]|$K|14|L|15|M|N]]|9|@]|A|$]]|$1|O|3|P|5|6|7|16|8|@$K|17|L|18|M|N]]|9|@]|A|$]]|$1|Q|3|R|5|6|7|19|8|@]|9|@]|A|$]]|$1|S|3|T|5|6|7|1A|8|@]|9|@]|A|$]]|$1|U|3|-4|5|6|7|1B|8|@]|9|@]|A|$]]]|V|$]]

For what I understand, VSCode is not in AppData anymore.

So Set the default git editor by executing that command in a command prompt window:

<pre><code>git config --global core.editor "'C:\Program Files (x86)\Microsoft VS Code\code.exe' -w"
</code></pre>

The parameter <code>-w</code>, <code>--wait</code> is to wait for window to be closed before returning. Visual Studio Code is base on Atom Editor. if you also have atom installed execute the command <code>atom --help</code>. You will see the last argument in the help is wait. 

Next time you do a <code>git rebase -i HEAD~3</code> it will popup Visual Studio Code. Once VSCode is close then Git will take back the lead.

Note: My current version of VSCode is 0.9.2

I hope that help.

blocks|key|2703315|text|好消息！在撰写本文时，此功能已经在0.10.12-insiders版本中实现，并通过0.10.14-insiders.实现因此，我们将在即将到来的1.0+Release+of+VS+Code版本中使用它。|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|2703316|实施参考：Implement+-w/--wait+command+line+arg|2703317|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/Microsoft/vscode/wiki/Roadmap|1|https://github.com/Microsoft/vscode/commit/276a1cf3079e691b75c56aa5f0fe629fc80953ac^0|H|G|16|G|21|M|0|0|5|10|1|0^^$0|@$1|2|3|4|5|6|7|R|8|@$9|S|A|T|B|C]|$9|U|A|V|B|C]]|D|@$9|W|A|X|1|Y]]|E|$]]|$1|F|3|G|5|6|7|Z|8|@]|D|@$9|10|A|11|1|12]]|E|$]]|$1|H|3|-4|5|6|7|13|8|@]|D|@]|E|$]]]|I|$J|$5|K|L|M|E|$N|O]]|P|$5|K|L|M|E|$N|Q]]]]

Good news! At the time of writing, this feature has already been implemented in the 0.10.12-insiders release and carried out through 0.10.14-insiders. Hence we are going to have it in the upcoming version <a href="https://github.com/Microsoft/vscode/wiki/Roadmap" rel="nofollow">1.0 Release of VS Code</a>.

Implementation Ref: <a href="https://github.com/Microsoft/vscode/commit/276a1cf3079e691b75c56aa5f0fe629fc80953ac" rel="nofollow">Implement -w/--wait command line arg</a>

blocks|key|135423|text|在Mac终端应用程序中运行此命令|type|unstyled|depth|inlineStyleRanges|entityRanges|data|135424|git+config+--global+core.editor+"/Applications/Visual\+Studio\+Code.app/Contents/Resources/app/bin/code"|code-block|syntax|javascript|135425|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

Run this command in your Mac Terminal app

<pre><code>git config --global core.editor "/Applications/Visual\ Studio\ Code.app/Contents/Resources/app/bin/code"
</code></pre>

blocks|key|2915830|text|在使用64位insiders的windows+10上，命令应该是：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2915831|代码git配置--全局core.editor+"'C:\Program+Files\Microsoft+VS+Code+Insiders\bin\+|2915832|+-insiders.cmd‘“|blockquote|2915833|2915834|2915835|您还可以将'Program+Files‘目录中的'code-insiders.cmd’重命名为'code.cmd‘，这样您现在就可以使用命令'code’了。开始编辑上的文件。目录|2915836|entityMap^0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|N|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|O|8|@]|9|@]|A|$]]|$1|G|3|-4|5|6|7|P|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|R|8|@]|9|@]|A|$]]|$1|K|3|-4|5|6|7|S|8|@]|9|@]|A|$]]]|L|$]]

on windows 10 using the 64bit insiders edition the command should be:

<blockquote>
 git config --global core.editor "'C:\Program Files\Microsoft VS Code
 Insiders\bin\code-insiders.cmd'"
</blockquote>

you can also rename the 'code-insiders.cmd' to 'code.cmd' in the 'Program Files' directory, 
in this way you can now use the command 'code .' to start editing the files on the . directory

blocks|key|136765|text|您需要使用命令：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|136766|git+config+--global+core.editor+"'C:\Program+Files\Microsoft+VS+Code\code.exe'+-n+-w"|code-block|syntax|javascript|136767|确保您可以从Git+Bash启动编辑器|offset|length|style|BOLD|136768|如果您想使用具有短路径的Code.exe，可以通过在.bash_profile中添加以下行来实现：|136769|alias+vscode="C:/Program\+Files/Microsoft\+VS\+Code/Code.exe"|136770|现在，您可以只使用vscode命令(或您为其命名的任何名称)来调用它。|CODE|136771|一些附加信息：|136772|136773|安装程序会将Visual+Studio代码添加到您的%25PATH%25中，因此您可以在控制台中键入“代码”以打开该文件夹中的VS代码。您需要在安装后重新启动控制台，以使对%25PATH%25环境变量的更改生效。|blockquote|136774|136775|entityMap^0|0|0|0|E|0|0|0|9|6|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|12|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|13|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|14|8|@$I|15|J|16|K|L]]|9|@]|A|$]]|$1|M|3|N|5|6|7|17|8|@]|9|@]|A|$]]|$1|O|3|P|5|D|7|18|8|@]|9|@]|A|$E|F]]|$1|Q|3|R|5|6|7|19|8|@$I|1A|J|1B|K|S]]|9|@]|A|$]]|$1|T|3|U|5|6|7|1C|8|@]|9|@]|A|$]]|$1|V|3|-4|5|6|7|1D|8|@]|9|@]|A|$]]|$1|W|3|X|5|Y|7|1E|8|@]|9|@]|A|$]]|$1|Z|3|-4|5|6|7|1F|8|@]|9|@]|A|$]]|$1|10|3|-4|5|6|7|1G|8|@]|9|@]|A|$]]]|11|$]]

You need to use command: 

<pre><code>git config --global core.editor "'C:\Program Files\Microsoft VS Code\code.exe' -n -w"
</code></pre>

Make sure you can start your editor from Git Bash

If you want to use Code.exe with short path, you can do this by adding the following line to your .bash_profile:

<pre><code>alias vscode="C:/Program\ Files/Microsoft\ VS\ Code/Code.exe"
</code></pre>

And now, you can call it using only <code>vscode</code> command(or whatever you named it)

Some additional info: 

<blockquote>
 Setup will add Visual Studio Code to your
 %PATH%, so from the console you can type 'code' to open VS Code on
 that folder. You will need to restart your console after the
 installation for the change to the %PATH% environmental variable to
 take effect.
</blockquote>

blocks|key|135450|text|我只想将这些反斜杠添加到之前的答案中，我使用的是Windows10+CMD，如果没有空格前面的反斜杠，它就不能工作。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|135451|git+config+--global+core.editor+"C:\\Users\\your_user_name\\AppData\\Local\\Programs\\Microsoft\+VS\+Code\\Code.exe"|code-block|syntax|javascript|135452|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

Just want to add these back slashes to previous answers, I am on Windows 10 CMD, and it doesn't work without back slashes before the spaces. 

<pre><code>git config --global core.editor "C:\\Users\\your_user_name\\AppData\\Local\\Programs\\Microsoft\ VS\ Code\\Code.exe"
</code></pre>

blocks|key|136788|text|另一个有用的选项是设置EDITOR和VISUAL环境变量。许多应用程序和实用程序都使用这些环境变量来了解要使用的编辑器。如果没有设置core.editor，Git也会使用其中之一(取决于Git版本)。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|136789|您可以使用以下命令为当前会话设置它：|136790|export+EDITOR="code+--wait"
export+VISUAL="$EDITOR"|code-block|syntax|javascript|136791|这样，不仅git，而且许多其他应用程序都将使用VS代码作为编辑器。|136792|例如，要使此更改永久生效，请将其添加到您的~/.profile中。有关更多选项，请参阅this+question。|136793|136794|此方法的另一个优点是，您可以为不同的情况设置不同的编辑器：|BOLD|136795|从本地terminal.|136796|When工作时，将通过会话进行连接。|unordered-list-item|136797|136798|这对VS+Code+(或任何其他GUI编辑器)特别有用，因为没有GUI它就不能工作。|136799|在Linux操作系统上，将以下代码放入您的~/.profile|136800|#+Preferred+editor+for+local+and+remote+sessions
if+[[+-n+$SSH_CONNECTION+]];+then+#+SSH+mode
++export+EDITOR='vim'
else+#+Local+terminal+mode
++export+EDITOR='code+-w'
fi
export+VISUAL="$EDITOR"|136801|这样，当您使用本地终端时，$SSH_CONNECTION环境变量将为空，因此将使用code+-w编辑器，但是当您通过SSH连接时，则$SSH_CONNECTION环境变量将是非空字符串，因此将使用vim编辑器。它是控制台编辑器，因此即使您通过SSH连接，它也可以工作。|136802|136803|有关EDITOR和VISUAL环境变量的区别，请参阅this+question。|136804|entityMap|0|LINK|mutability|MUTABLE|url|https://unix.stackexchange.com/questions/117467/how-to-permanently-set-environmental-variables|1|https://unix.stackexchange.com/q/4859/204811^0|B|6|I|6|1U|B|0|0|0|5|3|0|L|A|17|D|0|0|0|0|3|0|0|0|0|0|L|A|0|0|D|F|15|7|1U|F|2Q|3|0|0|2|6|9|6|Q|D|1|0^^$0|@$1|2|3|4|5|6|7|1L|8|@$9|1M|A|1N|B|C]|$9|1O|A|1P|B|C]|$9|1Q|A|1R|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|1S|8|@]|D|@]|E|$]]|$1|H|3|I|5|J|7|1T|8|@]|D|@]|E|$K|L]]|$1|M|3|N|5|6|7|1U|8|@$9|1V|A|1W|B|C]]|D|@]|E|$]]|$1|O|3|P|5|6|7|1X|8|@$9|1Y|A|1Z|B|C]]|D|@$9|20|A|21|1|22]]|E|$]]|$1|Q|3|-4|5|6|7|23|8|@]|D|@]|E|$]]|$1|R|3|S|5|6|7|24|8|@$9|25|A|26|B|T]]|D|@]|E|$]]|$1|U|3|V|5|6|7|27|8|@]|D|@]|E|$]]|$1|W|3|X|5|Y|7|28|8|@]|D|@]|E|$]]|$1|Z|3|-4|5|6|7|29|8|@]|D|@]|E|$]]|$1|10|3|11|5|6|7|2A|8|@]|D|@]|E|$]]|$1|12|3|13|5|6|7|2B|8|@$9|2C|A|2D|B|C]]|D|@]|E|$]]|$1|14|3|15|5|J|7|2E|8|@]|D|@]|E|$K|L]]|$1|16|3|17|5|6|7|2F|8|@$9|2G|A|2H|B|C]|$9|2I|A|2J|B|C]|$9|2K|A|2L|B|C]|$9|2M|A|2N|B|C]]|D|@]|E|$]]|$1|18|3|-4|5|6|7|2O|8|@]|D|@]|E|$]]|$1|19|3|1A|5|6|7|2P|8|@$9|2Q|A|2R|B|C]|$9|2S|A|2T|B|C]]|D|@$9|2U|A|2V|1|2W]]|E|$]]|$1|1B|3|-4|5|6|7|2X|8|@]|D|@]|E|$]]]|1C|$1D|$5|1E|1F|1G|E|$1H|1I]]|1J|$5|1E|1F|1G|E|$1H|1K]]]]

Another useful option is to set <code>EDITOR</code> and <code>VISUAL</code> environment variables. These environment variables are used by many applications and utilities to know what editor to use. Git also uses one of them (depending on Git version) if no <code>core.editor</code> is set.
You can set it for current session using:
<pre><code>export EDITOR=&quot;code --wait&quot;
export VISUAL=&quot;$EDITOR&quot;
</code></pre>
This way not only <code>git</code>, but many other applications will use VS Code as an editor.
To make this change permanent, add this to your <code>~/.profile</code> for example. See <a href="https://unix.stackexchange.com/questions/117467/how-to-permanently-set-environmental-variables">this question</a> for more options.
<hr />
Another advantage of this approach is that you can set different editors for different cases:
<ol>
<li>When you working from local terminal.</li>
<li>When you are connected through SSH session.</li>
</ol>
This is useful especially with VS Code (or any other GUI editor) because it just doesn't work without GUI.
On Linux OS, put this into your <code>~/.profile</code>:
<pre><code># Preferred editor for local and remote sessions
if [[ -n $SSH_CONNECTION ]]; then # SSH mode
 export EDITOR='vim'
else # Local terminal mode
 export EDITOR='code -w'
fi
export VISUAL=&quot;$EDITOR&quot;
</code></pre>
This way when you use a local terminal, the <code>$SSH_CONNECTION</code> environment variable will be empty, so the <code>code -w</code> editor will be used, but when you are connected through SSH, then <code>$SSH_CONNECTION</code> environment variable will be a non-empty string, so the <code>vim</code> editor will be used. It is console editor, so it will work even when you are connected through SSH.
<hr />
For the difference between <code>EDITOR</code> and <code>VISUAL</code> environment variables please see <a href="https://unix.stackexchange.com/q/4859/204811">this question</a>.

blocks|key|2915899|text|除了export+EDITOR="code+--wait"，请注意，在VSCode+v1.47+(2020年6月)中，这些不同的编辑器将经受VSCode重新加载/重新启动。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2915900|请参阅issue+99290|2915901|有了commit+1428d44，diff编辑器现在有机会在重新加载后存活下来，除非git资源上的diff编辑器被打开为活动编辑器，否则它可以正常工作：|2915902|2915903|📷|atomic|2915904|(+commit+24f1b69解决了这个问题)|2915905|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/microsoft/vscode/issues/99290|1|https://github.com/microsoft/vscode/commit/1428d44d172bf6fffddd198c71235df86b6ff0fa|2|IMAGE|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/93752063fee13aeab3026c9cdb2cedce.gif|imageAlt|3|https://github.com/microsoft/vscode/commit/24f1b69a901f941c4a0a327798e2f9f9058af008^0|2|R|0|3|B|0|0|2|E|1|0|0|0|1|2|0|2|E|3|0^^$0|@$1|2|3|4|5|6|7|17|8|@$9|18|A|19|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|1A|8|@]|D|@$9|1B|A|1C|1|1D]]|E|$]]|$1|H|3|I|5|6|7|1E|8|@]|D|@$9|1F|A|1G|1|1H]]|E|$]]|$1|J|3|-4|5|6|7|1I|8|@]|D|@]|E|$]]|$1|K|3|L|5|M|7|1J|8|@]|D|@$9|1K|A|1L|1|1M]]|E|$]]|$1|N|3|O|5|6|7|1N|8|@]|D|@$9|1O|A|1P|1|1Q]]|E|$]]|$1|P|3|-4|5|6|7|1R|8|@]|D|@]|E|$]]]|Q|$R|$5|S|T|U|E|$V|W]]|X|$5|S|T|U|E|$V|Y]]|Z|$5|10|T|11|E|$12|13|14|-4]]|15|$5|S|T|U|E|$V|16]]]]

In addition of <code>export EDITOR=&quot;code --wait&quot;</code>, note that, with VSCode v1.47 (June 2020), those diff editors will survice a VSCode reload/restart. 
See <a href="https://github.com/microsoft/vscode/issues/99290" rel="nofollow noreferrer">issue 99290</a>:
<blockquote>
with <a href="https://github.com/microsoft/vscode/commit/1428d44d172bf6fffddd198c71235df86b6ff0fa" rel="nofollow noreferrer">commit 1428d44</a>, diff editors now have a chance to survive reloads and this works OK unless the diff editor on a git resource is opened as the active one:
<a href="https://i.stack.imgur.com/pWxF4.gif" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/pWxF4.gif" alt="enter image description here" /></a>
</blockquote>
(and <a href="https://github.com/microsoft/vscode/commit/24f1b69a901f941c4a0a327798e2f9f9058af008" rel="nofollow noreferrer">commit 24f1b69</a> fixes that)

blocks|key|136812|text|git+config+--global+core.editor+"code+--wait"|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|136813|或|unstyled|136814|git+config+--global+core.editor+"code+-w"|136815|检查|136816|git+config+--global+e|136817|您的配置将在Visual+Studio代码中打开|136818|entityMap^0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$B|C]]|$1|D|3|E|5|F|7|R|8|@]|9|@]|A|$]]|$1|G|3|H|5|6|7|S|8|@]|9|@]|A|$B|C]]|$1|I|3|J|5|F|7|T|8|@]|9|@]|A|$]]|$1|K|3|L|5|6|7|U|8|@]|9|@]|A|$B|C]]|$1|M|3|N|5|F|7|V|8|@]|9|@]|A|$]]|$1|O|3|-4|5|F|7|W|8|@]|9|@]|A|$]]]|P|$]]

<pre><code>git config --global core.editor &quot;code --wait&quot;
</code></pre>
OR
<pre><code>git config --global core.editor &quot;code -w&quot;
</code></pre>
Check
<pre><code>git config --global e
</code></pre>
Your configuration will open in Visual Studio Code

blocks|key|2703542|text|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2703543|2703544|我必须将这段代码添加到我的.gitconfig文件中，这样git-lense才能工作：|2703545|[core]
++++#+Make+sure+that+interactive+rebases+open+correctly+with+vs+code
++++editor+=+code+-w+-n|code-block|syntax|javascript|2703546|-n是可选的--正如亚历克斯在下面提到的，它是--new-window的缩写，我发现它很有帮助:)|offset|length|style|CODE|2703547|entityMap^0|0|0|0|0|0|2|N|C|0^^$0|@$1|2|3|-4|4|5|6|Q|7|@]|8|@]|9|$]]|$1|A|3|-4|4|5|6|R|7|@]|8|@]|9|$]]|$1|B|3|C|4|5|6|S|7|@]|8|@]|9|$]]|$1|D|3|E|4|F|6|T|7|@]|8|@]|9|$G|H]]|$1|I|3|J|4|5|6|U|7|@$K|V|L|W|M|N]|$K|X|L|Y|M|N]]|8|@]|9|$]]|$1|O|3|-4|4|5|6|Z|7|@]|8|@]|9|$]]]|P|$]]

<blockquote>
what command line options would be required in the .gitconfig file to make this happen?
</blockquote>
I had to add this to my .gitconfig file for git-lense to work:
<pre class="lang-sh prettyprint-override"><code>
[core]
 # Make sure that interactive rebases open correctly with vs code
 editor = code -w -n

</code></pre>
<code>-n</code> is optional – as Alex mentioned below it's short for <code>--new-window</code> and I find it helpful :)

blocks|key|135556|text|如果你像我一样懒，我在git+bash+vscode+terminal+中添加了作为默认的。那我建议你也和我一样。|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|CODE|entityRanges|data|135557|135558|Step1:打开设置：Ctrl+%2B+,|unordered-list-item|135559|135560|搜索文件:+search+setting.json+-->+choose+|135561|Step2|135562|135563|135564|Step3:将代码粘贴到文件末尾，但要放在方括号'}'中|135565|135566|"gitbash"，"terminal.integrated.shell.windows":"E:\app\git\Git\bin\bash.exe"，|135567|entityMap^0|B|8|K|F|14|H|B|8|K|F|0|0|B|8|0|0|D|C|0|0|0|0|O|3|O|3|0|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@$9|Z|A|10|B|C]|$9|11|A|12|B|C]|$9|13|A|14|B|C]|$9|15|A|16|B|D]|$9|17|A|18|B|D]]|E|@]|F|$]]|$1|G|3|-4|5|6|7|19|8|@]|E|@]|F|$]]|$1|H|3|I|5|J|7|1A|8|@$9|1B|A|1C|B|D]]|E|@]|F|$]]|$1|K|3|-4|5|6|7|1D|8|@]|E|@]|F|$]]|$1|L|3|M|5|6|7|1E|8|@$9|1F|A|1G|B|D]]|E|@]|F|$]]|$1|N|3|O|5|J|7|1H|8|@]|E|@]|F|$]]|$1|P|3|-4|5|6|7|1I|8|@]|E|@]|F|$]]|$1|Q|3|-4|5|6|7|1J|8|@]|E|@]|F|$]]|$1|R|3|S|5|J|7|1K|8|@$9|1L|A|1M|B|C]|$9|1N|A|1O|B|D]]|E|@]|F|$]]|$1|T|3|-4|5|6|7|1P|8|@]|E|@]|F|$]]|$1|U|3|V|5|6|7|1Q|8|@]|E|@]|F|$]]|$1|W|3|-4|5|6|7|1R|8|@]|E|@]|F|$]]]|X|$]]

I added <code>git bash</code> in <code>vscode terminal</code> as default
If you are lazy like me. Then I advise you to do the same as me.
<ul>
<li>Step1: Open setting: <code>Ctrl + ,</code>
</li>
<li>Step2: search <code>.json</code> --&gt; choose file <code>setting.json</code>
</li>
<li>Step3: Paste the code at the end of the file but in brackets
<code>'}'</code>
&quot;terminal.integrated.defaultProfile.windows&quot;: &quot;gitbash&quot;,
&quot;terminal.integrated.shell.windows&quot;:&quot;E:\app\git\Git\bin\bash.exe&quot;,
</li>
</ul>

When using git at the command line, I am wondering if it is possible to use Visual Studio Code as the default editor, i.e. when creating commit comments and looking at a diff of a file from the command line.
I understand that it won't be possible to use it for doing merges (at least at the minute) but does anyone know if it is possible to use it for looking at diff's, and if so, what command line options would be required in the .gitconfig file to make this happen?
UPDATE 1:
I have tried an approach similar to what I have done for <a href="https://stackoverflow.com/questions/10564/how-can-i-set-up-an-editor-to-work-with-git-on-windows">Notepad++ in the past</a>, i.e.
<pre><code>#!/bin/sh

&quot;c:/Program Files (x86)/Notepad++/notepad++.exe&quot; -multiInst -notabbar -nosession -noPlugin &quot;$*&quot;
</code></pre>
And used:
<pre><code>#!/bin/sh

&quot;C:\Users\gep13\AppData\Local\Code\app-0.1.0\Code.exe&quot; &quot;$*&quot;
</code></pre>
But this results in an error message:
<pre><code>C:\temp\testrepo [master +1 ~0 -0]&gt; git commit
[8660:0504/084217:ERROR:crash_reporter_win.cc(70)] Cannot initialize out-of-process crash handler
Aborting commit due to empty commit message.
C:\temp\testrepo [master +1 ~0 -0]&gt;
</code></pre>
Code opens up correctly, with the expected content, but it isn't waiting on the response, i.e. clicking save and closing the window to return to prompt.
UPDATE 2:
I have just heard back from one of the developers working on VSCode. Looks like this functionality currently isn't supported :-(
<a href="https://twitter.com/IsidorN/status/595501573880553472" rel="nofollow noreferrer">https://twitter.com/IsidorN/status/595501573880553472</a>
If you are interested in seeing this feature get added, you might want to think about adding your votes here:
<a href="http://visualstudio.uservoice.com/forums/293070-visual-studio-code/suggestions/7756482-support-git-configure-diff-and-merge-tools" rel="nofollow noreferrer">http://visualstudio.uservoice.com/forums/293070-visual-studio-code/suggestions/7756482-support-git-configure-diff-and-merge-tools</a>
UPDATE 3:
I have been <a href="https://twitter.com/shanselman/status/595604230234210304" rel="nofollow noreferrer">reliably informed</a> that this feature has been picked up by the VSCode team, so I am looking forward to a future release that will include it.
UPDATE 4:
Thanks to @f-boucheros comment below, I have been able to get VS Code working as the default editor for commit comments, rebase, etc. I would still like to see if it is possible to use it as the diff tool as well.
UPDATE 5:
As per the accepted answer for the question, this is now possible using the V1.0 release of code.

How to use Visual Studio Code as default editor for git?

Visual Studio

Windows

Linux

我知道它不可能用来进行合并(至少现在是这样)，但是有没有人知道是否可以用它来查看比较，如果可以，在.gitconfig文件中需要哪些命令行选项才能实现这一点？更新1:我尝试了一种类似于我为所做的方法，即#!/bin/sh"c:/Program Files (x86)/Notepad++/notepad++.exe" -...

问如何使用Visual Studio代码作为git的默认编辑器？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何使用Visual Studio代码作为git的默认编辑器？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何使用Visual Studio代码作为git的默认编辑器？
EN