Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-14 12:11:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,561 Commits 3,898 Branches 364 Tags
b1407a87b05c2e9512eba9f44247dfd64c33cdfe
Commit Graph

467 Commits

Author SHA1 Message Date
Brendan Forster b1407a87b0 disable lookup for GitHub's version of Git 
If the classic GitHub for Windows (creatively named github.exe) is installed alongside the new GitHub Desktop (which installs a github.bat file to PATH), we can get into the situation where Code can ask the GUI to authenticate for a private repository, which it doesn't understand.
 2017-10-10 18:04:14 +11:00
Joao Moreno 58b990f3ef be more careful with git init 
fixes #35902
 2017-10-09 14:52:10 +02:00
Joao Moreno 6a6b589eb8 fix compile errors 2017-10-04 15:43:48 +02:00
Joao Moreno 9b7a6b6fb9 fixes #35513 2017-10-04 15:01:32 +02:00
Joao Moreno bb23d1244e lock git @types deps 
related to #35561
 2017-10-04 13:38:41 +02:00
Joao Moreno bcb3e0d00e detect conflict markers when staging 
fixes #33983
 2017-10-03 10:21:20 +02:00
Markus Wolf 24a31523f9 Merge remote-tracking branch 'upstream/master' into git-clone-with-url 2017-10-02 12:24:56 +02:00
Markus Wolf 855a55d755 fix: use single remote automatically 
If there is only one remote configured just use it instead of aksing the user which remote to use.

Closes #35373
 2017-10-02 11:31:59 +02:00
Joao Moreno 3b76085a6c fixes #35216 2017-09-28 11:51:40 +02:00
Joao Moreno a13fdcbf50 Repository.close 
fixes #35041
 2017-09-28 11:09:44 +02:00
Joao Moreno ae7e9613ce fixes #34358 2017-09-28 10:05:20 +02:00
Joao Moreno 5b3d47b0bb fixes #35044 2017-09-27 17:20:04 +02:00
Joao Moreno 826c2ae009 fix #33692 2017-09-27 16:47:42 +02:00
Joao Moreno 1ca31aa6db git.ignore should detect workspaces 
fixes #35176
 2017-09-27 12:23:42 +02:00
kieferrm 08d8f0f9f6 indentation changes 2017-09-25 18:36:43 -07:00
kieferrm fbb3e25987 omit endPoint where it defaults to none 2017-09-25 18:36:43 -07:00
kieferrm 32282d2be9 GDPR classification for git extension 2017-09-25 18:36:43 -07:00
Johannes Rieken 57aab4f84c Merge branch 'master' into joh/ftp 2017-09-20 13:48:02 +02:00
Joao Moreno 01dade32b7 fix #34645 2017-09-20 13:36:47 +02:00
isidor 93867e4ef2 merge master 2017-09-20 10:08:51 +02:00
Benjamin Pasero d0668fb167 git: leverage new ViewColumn.Active 2017-09-20 09:29:14 +02:00
isidor ceb34634b1 always use uri.toString() when comparing uris for equality 2017-09-19 15:59:23 +02:00
Joao Moreno a29640931a Merge branch 'splitview' into scm-viewlet 2017-09-18 11:32:04 +02:00
Johannes Rieken 7158d03d50 Merge branch 'master' into joh/ftp 2017-09-15 15:21:40 +02:00
Joao Moreno 867e521341 dont read XDG_RUNTIME_DIR 2017-09-15 12:57:16 +02:00
isidor 1559b68d09 git: open change enabled only for local files 2017-09-15 10:49:31 +02:00
Joao Moreno 1b314f3ef4 scm: rootUri api 2017-09-13 12:09:54 +02:00
Joao Moreno b1a7be798e add git.stageAll to provider menu 
related to #34230
 2017-09-13 09:18:09 +02:00
Joao Moreno 5a4a40c9cb fixes #34209 2017-09-12 15:13:49 +02:00
Markus Wolf 1730fcf7ac feat(git): allow url to be given to git.clone 
Closes #33857
 2017-09-08 10:51:48 +02:00
Joao 01619d3c34 git: internal git._syncAll command 2017-09-07 12:15:45 +02:00
Joao 11237b630f fixes #33878 2017-09-07 12:14:28 +02:00
Joao cb5d03296f fix compile error 2017-09-04 11:10:34 +02:00
Matt Bierner 69afce7650 Build using TS 2.5 (#33705) 
* Build using TS 2.5

Fixes #33704

* Remove explicit return type
 2017-09-01 13:52:42 -07:00
Joao e0ac453614 fixes #33655 2017-09-01 11:59:10 +02:00
Joao b4210889e5 remove gitContentProvider warning message 2017-09-01 11:36:54 +02:00
Joao f23b0d7974 fixes #33615 2017-09-01 11:23:44 +02:00
Joao Moreno 88e4bd7ad0 fixes #33309 2017-08-31 16:33:32 +02:00
Joao Moreno 4d1cc41085 fixes #33498 2017-08-31 16:19:19 +02:00
Joao Moreno c9e070991a remove close repo command 2017-08-31 16:12:10 +02:00
Joao 8ab7abed91 fixes #33521 2017-08-30 16:59:31 +02:00
Joao b4fa7f2e27 fixes #33499 2017-08-30 15:25:15 +02:00
Joao 5b265e0cab fixes #33341 2017-08-30 13:02:20 +02:00
Joao 475fb0e6cc fixes #11918 2017-08-30 12:48:47 +02:00
Joao 6d0e370140 fixes #33498 2017-08-30 12:35:05 +02:00
Joao 1138e4827b fixes #33401 2017-08-30 11:49:25 +02:00
Benjamin Pasero e6711d987a more fixing for #30674 2017-08-30 11:23:56 +02:00
Joao d027af369f fixes #33395 2017-08-29 15:06:58 +02:00
Joao d00f5c2047 fixes #33153 2017-08-29 15:06:58 +02:00
Joao 49eafc996d pop stash... 2017-08-29 15:06:57 +02:00