microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-21 12:57:31 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity
24,649 Commits 3,633 Branches 357 Tags
45fa36902ead1189c6d55ece66a8c0ba767ef419
Commit Graph

476 Commits

Author SHA1 Message Date
Joao Moreno
a6907bc57f use properties 2017-08-16 10:14:03 +02:00
Joao Moreno
f9f06beefa Merge branch '25849' of https://github.com/marckassay/vscode into marckassay-25849 2017-08-16 10:06:33 +02:00
Joao Moreno
f8fcaf44fc git: open file, open changes 2017-08-15 18:49:26 +02:00
Joao Moreno
fb60b01d96 git: model -> repository 2017-08-15 18:46:08 +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
56d1dadf05 git: multirepo clean 2017-08-15 16:21:46 +02:00
Joao Moreno
3f31510686 git: multirepo revert 2017-08-15 16:20:58 +02:00
Joao Moreno
b95a585df9 git: multi repo stage 2017-08-15 16:19:44 +02:00
Joao Moreno
76cfa5d796 git: remove splats 2017-08-15 16:14:41 +02:00
Joao Moreno
8c747ed66e git model remove run 2017-08-15 15:56:11 +02:00
Joao Moreno
303dd11747 git multirepo stage 2017-08-15 15:55:00 +02:00
Joao Moreno
16e8189650 model -> repository 2017-08-15 15:17:15 +02:00
Joao Moreno
91435475ee Merge branch 'master' into scm-multiroot 2017-08-15 12:03:01 +02:00
Joao Moreno
acb83d00c0 remove Resource from git model method interfaces 2017-08-15 11:53:35 +02:00
Joao Moreno
bbe70bc9b9 fixes #32459 2017-08-15 11:31:45 +02:00
Joao Moreno
5553acb377 cleanup git stash functionality 2017-08-15 10:03:42 +02:00
Joao Moreno
b9eb8baea5 wip: add across multiple repositories 2017-08-15 09:35:24 +02:00
Krzysztof Cieślak
8dcb181fbc Load stashes only when needed 2017-08-14 22:44:42 +02:00
Krzysztof Cieślak
b5bf3535ef Fix stash pop 2017-08-14 22:30:52 +02:00
Krzysztof Cieślak
13484ae98d Add commands 2017-08-14 22:30:50 +02:00
Krzysztof Cieślak
4cd45c49bd Repository and Model changes 2017-08-14 22:30:36 +02:00
Joao Moreno
b8b36a0f18 remove unused property 2017-08-14 16:44:58 +02:00
Joao Moreno
405ed72142 different command syntax 2017-08-14 15:30:23 +02:00
Joao Moreno
3268900f78 Merge branch 'master' into scm-multiroot 2017-08-14 15:10:07 +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
João Moreno
688df5e5cc Merge pull request #27882 from marckassay/24919 
For 'conflict (add/add)' and 'conflict (modify/delete)' issues
 2017-08-10 15:04:53 +01:00
Joao Moreno
2e35b736de 💄 2017-08-10 16:01:01 +02:00
Joao Moreno
9cda6465b4 Merge branch 'feature-git' of https://github.com/eamodio/vscode into eamodio-feature-git 2017-08-10 15:55:59 +02: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
João Moreno
7494a1b944 Merge pull request #27136 from dmportella/gpg-support 
GPG support
 2017-08-10 09:48:20 +01:00
João Moreno
e122921970 Merge pull request #26147 from samlh/patch-1 
Fix staging lines to not corrupt line endings when autocrlf is enabled
 2017-08-10 09:39:44 +01:00
Eric Amodio
c0381f2b62 Closes #27410 - support multi-select on open file/changes commands 
Also stops the opening of an editor from stealing focus -- so that it is much easier to keyboard around (it also aligns with the behavior of the main file explorer)
 2017-08-09 00:27:09 -04:00
Joao Moreno
1c24f825b5 git: model commands 2017-07-24 16:40:09 +02:00
Bugra Cuhadaroglu
83e1719559 Feature 30055 - Disallow staging of files with unresolved conflicts 2017-07-13 00:42:03 -04:00
Daniel Portella
ff1d9f13c6 added Config information 
Ticket #5065
 2017-07-11 17:09:36 +01:00
Daniel Portella
d266d9a994 [WIP] Added support for -S for signing git commits 
Ticket #5065
 2017-07-11 17:09:36 +01:00
Joao Moreno
3e6516db98 wip: model registry 2017-07-11 10:19:41 +02:00
Joao Moreno
35d598a2e3 fixes #30085 2017-07-10 10:38:24 +02:00
Joao Moreno
dbbc064c13 fixes #30214 2017-07-07 12:22:25 +02:00
Joao Moreno
3e34503afc git: remove unused command 2017-07-06 10:11:20 +02:00
Joao Moreno
428ad7c39c fixes #30162 2017-07-06 09:21:33 +02:00
Eric Amodio
4f50b29e92 Addresses #26184 - use configuration for pinned default (#27357) 
* Addresses #26184 - use configuration for pinned default

* Honors the preview editor setting above all

* Removes passing undefined to pinned internally
re: requested code review changes

* Removes unnecessary undefined

* feedback
 2017-07-06 08:12:39 +02:00
Joao Moreno
313aad16d0 fixes #21439 2017-07-05 16:31:34 +02:00
Maryam Archie
263278aaed Resolve timeout issue 2017-07-03 16:08:08 -04:00
Maryam Archie
e989a259d3 Show git clone progress in status bar and source control feed 2017-07-03 15:28:15 -04:00
Joao Moreno
ac78ebd870 fixes #30054 2017-07-03 17:28:33 +02:00
kieferrm
3f8bd163f4 update dependency on vscode-extension-telemetry 2017-06-30 09:57:37 -07:00