428ad7c39c
fixes #30162
2017-07-06 09:21:33 +02:00
fd2173a817
fixes #29728
2017-06-28 11:40:34 +02:00
dd07972305
fixes #27488
2017-06-27 12:40:28 +02:00
417cdb62b7
git.pullFrom
...
octopus commit
2017-06-26 15:46:51 +02:00
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
53ce1b0b46
Merge branch 'master' of https://github.com/matthewshirley/vscode into matthewshirley-master
2017-06-26 15:36:00 +02:00
14380f9766
Merge branch 'bc/Feature26738' of https://github.com/BugraC/vscode into BugraC-bc/Feature26738
2017-06-26 15:34:26 +02:00
842421f3f5
catch merge conflicts
2017-06-26 11:18:18 +02:00
f23a32b7a7
Merge branch 'git-merge' of https://github.com/gecharo/vscode into gecharo-git-merge
2017-06-26 09:56:42 +02:00
d5eda85077
streamline git ignore
2017-06-26 09:49:34 +02:00
eef5090751
Fixing formatting of model.ts
2017-06-23 17:32:04 -07:00
31bef546a7
Don't rebase on pull from
2017-06-23 17:27:33 +02:00
faf6134387
Add branch and remote args to pull in model and repository
2017-06-23 11:09:21 +02:00
febe79bfc1
Adding some logic behind the gitignore entries.
2017-06-21 21:55:27 -07:00
bc2d0e43de
Adding apply edit to the gitignore file.
2017-06-21 19:52:41 -07:00
9aaeb1989a
Registering and handling commad
2017-06-21 19:51:38 -07:00
39f33ae2ae
Git: Pull from specific branch
2017-06-20 19:52:47 -07:00
a807a515bb
fixes #26642
2017-06-14 16:32:00 +02:00
09e22b8542
fixes #27367
2017-06-14 15:16:34 +02:00
b348a0b780
handle git branch delete error ("not fully merged")
2017-05-26 09:27:25 +02:00
b96478ebcc
add git delete branch command
2017-05-26 09:27:24 +02:00
42ab4c41a4
Add "pullFrom" git command
...
Resolves Microsoft/vscode#26738
2017-05-20 11:07:34 -07:00
e707642a3c
git: don't use fs.watch
...
fixes #25175
2017-05-10 11:03:18 +02:00
818fa5a50f
#10542 Ability to merge local git branches
2017-05-01 16:44:00 +03:00
9b7a8813e0
🐛 SourceControlResourceDecorations.faded
...
fixes #24097
2017-04-27 15:38:27 +02:00
fad430efb9
🐛 fixes #25252
2017-04-26 17:14:35 +02:00
2d64239944
rename ProgressLocation.Scm to ProgressLocation.SourceControl, #18066
2017-04-25 12:38:42 +02:00
c5d2d86a70
adopt git to final progress API, #18066
2017-04-25 12:38:41 +02:00
566fdd4879
🎨 cleanup git show code
2017-04-24 10:51:08 +02:00
7cf0ad0440
Merge branch 'git-encoding' of https://github.com/igelbox/vscode into igelbox-git-encoding
2017-04-24 10:25:45 +02:00
fb094b4322
✨ git: huge repo prevention
2017-04-19 08:44:16 +02:00
d2c40f06b3
🐛 catch git fetch errors
2017-04-18 14:49:09 +02:00
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
0d14027696
Fix a few compile issues when using TS 2.3 ( #24731 )
...
Tested recomppiling VSCode with TS2.3. This fixes a few issues that were discovered, including workarounds for:
* https://github.com/Microsoft/TypeScript/issues/15184
* https://github.com/Microsoft/TypeScript/issues/15185
2017-04-13 17:14:50 -07:00
2ab523ae7d
🐛 git: don't wait for idle when git show
...
fixes #24213
2017-04-10 15:37:36 +02:00
b8747ec0af
🐛 use fsPath when getting paths out of URIs
...
fixes #23297
2017-04-10 09:40:23 +02:00
8c5cce0e14
🐛 git: don't show progress on fetch
...
fixes #24170
2017-04-07 15:16:25 +02:00
dc66fda881
🐛 git: remove lock file checking, replace it with try-catch
2017-04-07 11:52:01 +02:00
8738327b29
🐛 any resource can come in via command arguments
2017-03-30 14:40:55 +02:00
ccfcbe6c6f
scm: move from pull to push model
2017-03-29 22:44:25 +02:00
12470dccf6
🐛 make askpass work in no-workspace environment
...
fixes #23474
2017-03-29 12:11:33 +02:00
75576e3cca
💥 scm id -> contextKey
2017-03-27 11:54:23 +02:00
24cd191ac2
✨ scm: require uris on resources and groups
2017-03-24 17:55:14 +01:00
afdaf562ee
🐛 fix git clone command
...
fixes #22620
2017-03-20 15:49:34 +01:00
49bc06dde4
🐛 git: don't push on sync if unnecessary
2017-03-10 15:00:40 +01:00
2e88c82ffd
🐛 listen on workspace change, when no git repo is init
...
fixes #18840
2017-03-08 16:29:21 +01:00
3a12747e1f
fixes #21095
2017-02-22 15:11:08 +01:00
6efcc5182c
fixes #21009
2017-02-22 15:02:57 +01:00
b22fbb86e3
fixes #20943
2017-02-21 17:20:13 +01:00
cc71202224
git: clone command
2017-02-20 15:54:29 +01:00
Joao Moreno
Bugra Cuhadaroglu
Krzysztof Cieślak
NKumar2
Maik Riechert
Maik Riechert
Matt Shirley
Rokas Gečas
Johannes Rieken
Vakhurin Sergey
Matt Bierner