Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-27 13:40:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,634 Commits 2,497 Branches 340 Tags
dd07972305ece778d49eafe2a099dfd01f855ece
Commit Graph

313 Commits

Author SHA1 Message Date
Joao Moreno
dd07972305 fixes #27488 2017-06-27 12:40:28 +02:00
Joao Moreno
91a02c7a0a 💄 2017-06-26 16:14:29 +02:00
Joao Moreno
2f54b0001b Merge branch 'feature-git-open-old-file' of https://github.com/Duroktar/vscode into Duroktar-feature-git-open-old-file 2017-06-26 16:09:44 +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
7b90f16e19 rename ignore action 2017-06-26 14:50:39 +02:00
Joao Moreno
842421f3f5 catch merge conflicts 2017-06-26 11:18:18 +02:00
Joao Moreno
df9c7d01b5 💄 2017-06-26 11:05:59 +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
Joao Moreno
d5eda85077 streamline git ignore 2017-06-26 09:49:34 +02:00
Bugra Cuhadaroglu
eef5090751 Fixing formatting of model.ts 2017-06-23 17:32:04 -07:00
Krzysztof Cieślak
31bef546a7 Don't rebase on pull from 2017-06-23 17:27:33 +02:00
Krzysztof Cieślak
f9f13f3be9 Add pullFrom command to package.json 2017-06-23 11:16:05 +02:00
Krzysztof Cieślak
df4d817111 Add pullFrom command 2017-06-23 11:09:44 +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
febe79bfc1 Adding some logic behind the gitignore entries. 2017-06-21 21:55:27 -07:00
Bugra Cuhadaroglu
bc2d0e43de Adding apply edit to the gitignore file. 2017-06-21 19:52:41 -07:00
NKumar2
9aaeb1989a Registering and handling commad 2017-06-21 19:51:38 -07:00
NKumar2
2bad7de4e3 Util function to append string in file 2017-06-21 19:50:14 -07:00
Joao Moreno
5667cc0e69 use vsce to determine what to package when bundling extensions 
fixes #29054
 2017-06-21 16:17:21 +02:00
Bugra Cuhadaroglu
39f33ae2ae Git: Pull from specific branch 2017-06-20 19:52:47 -07:00
Georgios Andreadis
cee711bb23 Improve grammar of config setting description 
While the former version is technically correct, I consider the proposed version easier to read.
 2017-06-18 11:35:07 +02:00
Joao Moreno
fd2dac6d58 fixes #28506 2017-06-16 10:00:59 +02:00
Joao Moreno
a807a515bb fixes #26642 2017-06-14 16:32:00 +02:00
Joao Moreno
09e22b8542 fixes #27367 2017-06-14 15:16:34 +02:00
Benjamin Pasero
eac49a321b Git: rename 'Publish' to 'Publish Branch' (fixes #26133) 2017-06-01 09:26:37 +02:00
Christof Marti
89fa243fc9 Hid Git actions from merge conflict (fixes #27563) 2017-05-31 10:28:15 -07:00
Joao Moreno
a0a1b9e0d6 fixes #26184 2017-05-26 09:27:28 +02:00
Maik Riechert
3df1eca296 localize 2017-05-26 09:27:25 +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
Phil Price
191fc7c9d9 Remove git merge conflict decorator 2017-05-22 18:40:14 -07:00
Matt Shirley
42ab4c41a4 Add "pullFrom" git command 
Resolves Microsoft/vscode#26738
 2017-05-20 11:07:34 -07:00
Duroktar
54da9357ba add "open old file" git command 
this implements #23011
 2017-05-14 22:03:38 -03:00
Anthony Sottile
0b7f4425ef Correct LC_ALL. Resolves #26227 2017-05-10 13:37:52 -07:00
Joao Moreno
e707642a3c git: don't use fs.watch 
fixes #25175
 2017-05-10 11:03:18 +02:00
Matt Bierner
7d2dea4e45 Add "Include" to extension TSConfig Files (#25860) 
**Bug**
Most VSCode extensions currently specify `"exclude"` in their `tsconfig.json` but not `"include"`. This may result in extra files being included in each project

**Fix**
Add  `"include": ["src/**/*"]` to all extension tsconfig files
 2017-05-05 11:37:59 -07:00
Rokas Gečas
89cd05f877 #10542 MergeItem class created, localized strings 2017-05-05 14:12:31 +03:00
João Moreno
6067977ea9 Merge pull request #26008 from letmaik/git-sync-ahead-behind 
Show ahead/behind indicator while git syncing
 2017-05-05 12:56:12 +02:00
Maik Riechert
1a4f9ab0e6 show ahead/behind while git syncing 
reverts fab6f8871a
 2017-05-05 10:15:08 +01:00
Joao Moreno
4c62dfa0a4 git commit with input bail early 2017-05-04 16:45:49 +02:00
Joao Moreno
b31c1e1fc9 use global settings 2017-05-04 16:42:02 +02:00
Joao Moreno
0dcb957f4c Merge branch 'Issue15613_AllFilesCommitted' of https://github.com/seesemichaelj/vscode into seesemichaelj-Issue15613_AllFilesCommitted 2017-05-04 16:32:37 +02:00
Joao Moreno
af6f8aa748 clean up #24950 2017-05-04 16:04:30 +02:00
Joao Moreno
b94f56f7cc Merge branch 'git-default-branch-directory' of https://github.com/ihalip/vscode into ihalip-git-default-branch-directory 2017-05-04 16:00:45 +02:00
Rokas Gečas
818fa5a50f #10542 Ability to merge local git branches 2017-05-01 16:44:00 +03:00
Joao Moreno
9b7a8813e0 🐛 SourceControlResourceDecorations.faded 
fixes #24097
 2017-04-27 15:38:27 +02:00
Joao Moreno
f0fe019745 🐛 remove git init icon 
fixes #21103
 2017-04-27 11:25:45 +02:00