Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-27 19:08:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,213 Commits 5,310 Branches 393 Tags
38207d4ec86967f09251e4a10e2daffcc5853be6
Commit Graph
53 Commits
Author SHA1 Message Date
Joao Moreno ac78ebd870 fixes #30054 2017-07-03 17:28:33 +02:00
Joao Moreno a05d64d7f0 fixes #29448 2017-06-29 11:05:39 +02:00
Joao Moreno dd07972305 fixes #27488 2017-06-27 12:40:28 +02:00
Joao Moreno 417cdb62b7 git.pullFrom 
octopus commit
 2017-06-26 15:46:51 +02:00
Joao Moreno 5f31035e46 Merge branch 'git_pull_from' of https://github.com/Krzysztof-Cieslak/vscode into Krzysztof-Cieslak-git_pull_from 2017-06-26 15:36:17 +02:00
Joao Moreno 53ce1b0b46 Merge branch 'master' of https://github.com/matthewshirley/vscode into matthewshirley-master 2017-06-26 15:36:00 +02:00
Joao Moreno 14380f9766 Merge branch 'bc/Feature26738' of https://github.com/BugraC/vscode into BugraC-bc/Feature26738 2017-06-26 15:34:26 +02:00
Joao Moreno 842421f3f5 catch merge conflicts 2017-06-26 11:18:18 +02:00
Joao Moreno f23a32b7a7 Merge branch 'git-merge' of https://github.com/gecharo/vscode into gecharo-git-merge 2017-06-26 09:56:42 +02:00
Krzysztof Cieślak faf6134387 Add branch and remote args to pull in model and repository 2017-06-23 11:09:21 +02:00
Bugra Cuhadaroglu 39f33ae2ae Git: Pull from specific branch 2017-06-20 19:52:47 -07:00
Joao Moreno 09e22b8542 fixes #27367 2017-06-14 15:16:34 +02:00
Maik Riechert b348a0b780 handle git branch delete error ("not fully merged") 2017-05-26 09:27:25 +02:00
Maik Riechert b96478ebcc add git delete branch command 2017-05-26 09:27:24 +02:00
Matt Shirley 42ab4c41a4 Add "pullFrom" git command 
Resolves Microsoft/vscode#26738
 2017-05-20 11:07:34 -07:00
Anthony Sottile 0b7f4425ef Correct LC_ALL. Resolves #26227 2017-05-10 13:37:52 -07:00
Rokas Gečas 818fa5a50f #10542 Ability to merge local git branches 2017-05-01 16:44:00 +03:00
Joao Moreno 9234a7c97c 🐛 dont call iconv with unsupported encodings 
fixes #25359
 2017-04-26 16:58:12 +02:00
Joao Moreno facdcded9d 🐛 git status errors are incomplete 
fixes #25408
fixes #25302
 2017-04-26 16:54:45 +02:00
Joao Moreno 24dcf7a27d 🐛 git always show stderr 
fixes #23632
 2017-04-25 17:37:27 +02:00
Joao Moreno 566fdd4879 🎨 cleanup git show code 2017-04-24 10:51:08 +02:00
Joao Moreno 3598679114 don't decode stderr 2017-04-24 10:37:15 +02:00
Joao Moreno 7cf0ad0440 Merge branch 'git-encoding' of https://github.com/igelbox/vscode into igelbox-git-encoding 2017-04-24 10:25:45 +02:00
Joao Moreno fb094b4322 ✨ git: huge repo prevention 2017-04-19 08:44:16 +02:00
Joao Moreno 6146b9739a ⚡ git: run status without buffering whole output 2017-04-18 17:16:20 +02:00
Vakhurin Sergey 74349805ab Added support for encodings for Git. 
Fixes #21146

**Bug**
Git always uses utf8 encoding for retrieving file contents.

**Fix**
Pass the 'files.encoding' configuration property to the git-extension and use this encoding to decode git output.
 2017-04-17 23:00:08 +03:00
Joao Moreno dc66fda881 🐛 git: remove lock file checking, replace it with try-catch 2017-04-07 11:52:01 +02:00
Joao Moreno 12470dccf6 🐛 make askpass work in no-workspace environment 
fixes #23474
 2017-03-29 12:11:33 +02:00
Joao Moreno 04a4fb0c87 🐛 always call git in english 
fixes #22355
 2017-03-24 09:48:39 +01:00
Joao Moreno 49bc06dde4 🐛 git: don't push on sync if unnecessary 2017-03-10 15:00:40 +01:00
Joao Moreno 6814168089 🐛 mkdirp before git.clone 
fixes #21567
 2017-03-08 17:02:19 +01:00
Joao Moreno 3a12747e1f fixes #21095 2017-02-22 15:11:08 +01:00
Joao Moreno cc71202224 git: clone command 2017-02-20 15:54:29 +01:00
Joao Moreno 77f0e95307 git: askpass support 2017-02-20 12:28:42 +01:00
Joao Moreno c894486977 git: better scoped git behaviour 2017-02-16 16:28:05 +01:00
Joao Moreno 9a3321404e git: undo command 2017-02-08 12:59:19 +01:00
Joao Moreno 63a69695f7 git: always run in english locale 2017-02-06 12:39:08 +01:00
Matt Bierner cda3584a99 Use @types/node in extensions (#19692) 
Switches builtin extensions to use @types/node for node definitions. Fixes a few errors that show up as a result of updating to a more modern version of node.d.ts
 2017-02-01 15:20:17 -08:00
Joao Moreno 42e938f979 git: remove denodeify dependency 2017-01-26 15:14:52 +01:00
Joao Moreno 5690a47892 remove lodash dependency 
fixes #19438
 2017-01-26 14:56:17 +01:00
Joao Moreno 43dd9b76b0 git: nls 
related to #18615
 2017-01-17 17:38:00 +01:00
Joao Moreno f2bb702d6f scm: fix bad string concatenation 2017-01-16 11:17:33 +01:00
Joao Moreno c46b5c8a8b git: better error handling 2017-01-12 09:37:54 +01:00
Joao Moreno 6ea8b8242d git: fix commit all 2017-01-11 12:08:38 +01:00
Joao Moreno cbb7a2cd45 git: log everything 2017-01-10 17:11:17 +01:00
Joao Moreno 8805d211b7 git: fix process env 2017-01-10 17:07:44 +01:00
Joao Moreno 5774cc9cac git: commit 2017-01-10 16:28:56 +01:00
Joao Moreno 178310abe4 git model 2016-11-29 17:09:55 +01:00
Joao Moreno eb494b4c63 remove encoding detection 2016-11-29 10:02:34 +01:00
Joao Moreno dd043965ad move git lib over to extension 2016-11-28 17:18:46 +01:00