Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-27 05:05:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,993 Commits 3,058 Branches 347 Tags
d2470e2edf2cbe759068679d57504d646ab020c6
Commit Graph

190 Commits

Author SHA1 Message Date
Joao Moreno
3070c0bb66 Merge branch 'dirtydiff' 2017-10-12 16:07:31 +02:00
Johannes Rieken
f813a949c1 adjust scm colors 2017-10-12 14:47:02 +02:00
Joao Moreno
7d729c9d17 diff: inline actions 2017-10-11 15:16:47 +02:00
Johannes Rieken
a34ee0c5aa label tweak 2017-10-10 17:09:36 +02:00
Johannes Rieken
9c4052804d adjust git colors 2017-10-10 17:09:35 +02:00
Johannes Rieken
e73da33e4f add back untracked color, remove suffix for now 2017-10-10 17:09:35 +02:00
Johannes Rieken
73164106d5 simplify git decorations... 2017-10-10 17:09:34 +02:00
Johannes Rieken
5c109769f0 use ColorIdentifier instead of Color, define some git colors for untracked, modifed, and ignored 2017-10-10 17:08:53 +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
Joao Moreno
a13fdcbf50 Repository.close 
fixes #35041
 2017-09-28 11:09:44 +02:00
Raoul D'Cunha
21aac84936 Add support for Stash (Include Untracked) 2017-09-20 17:06:52 +12:00
isidor
1559b68d09 git: open change enabled only for local files 2017-09-15 10:49:31 +02:00
Joao Moreno
b1a7be798e add git.stageAll to provider menu 
related to #34230
 2017-09-13 09:18:09 +02:00
Joao Moreno
c9e070991a remove close repo command 2017-08-31 16:12:10 +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
8f8bbff336 fixes #33325 2017-08-29 15:06:57 +02:00
Joao
2624eff8fe Merge branch 'master' into scm-multiroot 2017-08-25 11:36:39 +02:00
Joao Moreno
e9798613ad git: gitOpenRepositoryCount 2017-08-23 16:25:20 +02:00
Joao Moreno
ca068b3695 fix git.pullFrom group 2017-08-23 15:55:41 +02:00
Justin Horner
e34b313026 Merge branch 'master' into justinhhorner-git-rename-branch 2017-08-21 22:51:06 -04:00
Joao Moreno
071652f161 git: improved discard all 2017-08-21 11:48:35 +02:00
Joao Moreno
f8fcaf44fc git: open file, open changes 2017-08-15 18:49:26 +02:00
Joao Moreno
dc80da4b5a git: remove git init 2017-08-15 18:15:28 +02:00
Joao Moreno
fe8ee2e7b8 git: repository == scm provider 2017-08-15 18:03:47 +02:00
Joao Moreno
bbe70bc9b9 fixes #32459 2017-08-15 11:31:45 +02:00
Krzysztof Cieślak
13484ae98d Add commands 2017-08-14 22:30:50 +02:00
João Moreno
2f57095b91 Merge pull request #29264 from Krzysztof-Cieslak/commit_amend 
Add Git commit amend commands
 2017-08-11 09:02:12 +01:00
Justin Horner
b3a977e32a Add rename branch command 2017-08-10 14:00:27 -04:00
Joao Moreno
e12c7d3830 Merge branch 'ashutoshdhundhara-git-tag' 2017-08-10 15:44:23 +02:00
Joao Moreno
37de7e182f git: cleanup tag 2017-08-10 15:44:10 +02:00
Joao Moreno
0bd753f8a1 Merge branch 'git-tag' of https://github.com/ashutoshdhundhara/vscode into ashutoshdhundhara-git-tag 2017-08-10 15:38:26 +02:00
Harjyot Singh
3085d3ebd7 Command added 2017-07-26 03:36:26 +05:30
Daniel Portella
ff1d9f13c6 added Config information 
Ticket #5065
 2017-07-11 17:09:36 +01:00
kieferrm
3f8bd163f4 update dependency on vscode-extension-telemetry 2017-06-30 09:57:37 -07: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
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
f9f13f3be9 Add pullFrom command to package.json 2017-06-23 11:16:05 +02:00
Krzysztof Cieślak
0636016735 Add git amend commands in package.json 2017-06-22 14:22:35 +02:00
NKumar2
9aaeb1989a Registering and handling commad 2017-06-21 19:51:38 -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
Christof Marti
89fa243fc9 Hid Git actions from merge conflict (fixes #27563) 2017-05-31 10:28:15 -07:00
Maik Riechert
b96478ebcc add git delete branch command 2017-05-26 09:27:24 +02:00