Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 10:38:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,497 Commits 3,670 Branches 359 Tags
fd245fcda031687f58a5d8cd2cf3c70ca4e1ad9d
Commit Graph

897 Commits

Author SHA1 Message Date
Johannes Rieken
0ed7b0e701 rename abbreviation to letter, #54938 2018-08-15 10:48:09 +02:00
Tom Basche
bf3b694738 Add --allow-empty option 2018-08-09 11:52:33 +10:00
Tom Basche
fd2e5ac7f8 Add the ability to push empty commits 2018-08-09 11:48:08 +10:00
wistcc
4e3f1e2a5e Addressing feedback 2018-08-08 10:31:53 -04:00
wistcc
06447486bb Merge branch 'master' into WC/55376 2018-08-07 22:45:56 -04:00
wistcc
64076e6d66 Adding the git.showStagedChangesResourceGroup config property 2018-08-07 22:41:34 -04:00
wistcc
12292d0917 Fixing text when reverting changes for deleted file 2018-08-07 21:57:12 -04:00
Johannes Rieken
34159e797b adding webpack.config.js 2018-08-07 17:07:01 +02:00
Joao Moreno
9682614323 fixes #55122 2018-08-02 14:26:32 +02:00
Eric Gang
ebf16df683 Fix a compiler error 
I didn't notice the preservation should be put under a condition
 2018-07-24 14:26:13 +08:00
Segev Finer
6bf1b8bbec Try to checkout a new local branch when checking out a remote branch 
This handles the case when no local branch exists. You will get an error
if a local branch with the same name already exists. Better behavior for
this case can be implemented later.

Fixes #54601
 2018-07-24 01:41:48 +03:00
Eric Gang
dd1cbbecfd Reserve revealed editor area after using git diff 
fix the issue #53465
 2018-07-23 20:59:36 +08:00
Joao Moreno
bcdad4c79f fixes #53520 2018-07-18 11:12:06 +02:00
Konstantin Müller
c56219e13d #54204 add commands to apply stash 2018-07-14 10:01:47 +02:00
Joao Moreno
044d192df0 remove bad timeout 2018-07-10 18:15:21 +02:00
Joao Moreno
6957a5c058 make git activation async 
fixes #50292
 2018-07-10 12:37:25 +02:00
Joao Moreno
19df280c7f fixes #53849 2018-07-09 10:37:51 +02:00
Joao Moreno
ee0a7a265d Merge branch 'master' of github.com:Microsoft/vscode 2018-07-09 10:15:59 +02:00
Joao Moreno
b18b795936 fixes #53668 2018-07-09 10:15:55 +02:00
Joao Moreno
1d831bdcf1 Merge remote-tracking branch 'origin/master' 2018-07-06 16:45:41 +02:00
Joao Moreno
b6781b0058 align lstree implementations 2018-07-06 16:45:03 +02:00
Joao Moreno
00a1abe912 cleanup git relative path calculation 2018-07-06 16:37:53 +02:00
Joao Moreno
3f9e71722d Merge commit 'refs/pull/49397/head' of github.com:Microsoft/vscode into pr/49397 2018-07-06 15:46:10 +02:00
João Moreno
d1f8ff6161 Merge pull request #52812 from Microsoft/joao/uri-handler 
Finalize UriHandler API
 2018-07-06 15:43:13 +02:00
Joao Moreno
ba98812272 💄 2018-07-06 15:31:43 +02:00
Joao Moreno
e4d42b6b9b Merge commit 'refs/pull/47578/head' of github.com:Microsoft/vscode into pr/47578 2018-07-06 15:23:18 +02:00
Joao Moreno
689c38f4aa 💄 2018-07-06 15:19:27 +02:00
Joao Moreno
4215f96251 Merge commit 'refs/pull/48020/head' of github.com:Microsoft/vscode into pr/48020 2018-07-06 15:10:34 +02:00
Joao Moreno
2b03845eef 💄 2018-07-06 15:09:41 +02:00
Joao Moreno
da1a35aabc Merge commit 'refs/pull/47890/head' of github.com:Microsoft/vscode into pr/47890 2018-07-06 15:07:20 +02:00
Joao Moreno
b5e8f88e3b use more resource level settings for git 2018-07-06 15:03:36 +02:00
Joao Moreno
50189ad617 Merge commit 'refs/pull/47819/head' of github.com:Microsoft/vscode into pr/47819 2018-07-06 14:54:42 +02:00
Joao Moreno
3a54676f50 move successful push notification into repository 2018-07-06 14:53:13 +02:00
Joao Moreno
ead170df00 Merge commit 'refs/pull/47790/head' of github.com:Microsoft/vscode into pr/47790 2018-07-06 14:48:10 +02:00
Joao Moreno
0b9ed72669 improve selection restoration 2018-07-06 14:45:44 +02:00
Joao Moreno
cb6d6aa512 Merge commit 'refs/pull/47238/head' of github.com:Microsoft/vscode into pr/47238 2018-07-06 14:41:52 +02:00
Joao Moreno
cc6d8aa00e Merge remote-tracking branch 'origin/master' into joao/uri-handler 2018-07-06 12:49:16 +02:00
Joao Moreno
f950abaa81 git: extract categorizeResourceByResolution 2018-07-06 12:34:38 +02:00
Joao Moreno
8f6c6e8bc0 Merge commit 'refs/pull/50252/head' of github.com:Microsoft/vscode into pr/50252 2018-07-06 12:26:22 +02:00
Joao Moreno
c0cfa06328 fix #44106 2018-07-06 12:20:56 +02:00
Joao Moreno
e045147e44 improve conflicts during git rebase flow 2018-07-06 12:15:27 +02:00
Joao Moreno
92693a1b26 API: UriHandler, rename and docs 2018-06-25 15:13:03 +02:00
wistcc
5c02579269 Adding the git.syncRebase setting 2018-06-20 21:11:36 -04:00
João Moreno
c3942c67b1 Merge pull request #52145 from NahomAgidew/master 
Remove inline git revert confirmation alert (Issue #43625)
 2018-06-18 10:54:49 +02:00
João Moreno
4e575be919 Merge pull request #49167 from chenhowa/git-errors 
Await git.pullFrom and gitt.pushTo to ensure any failures display an …
 2018-06-18 10:52:46 +02:00
João Moreno
4b1df4f4a7 Update statusbar.ts 2018-06-18 10:44:13 +02:00
Nahom Abi
080e8247cc Fix #51677: Git icon not spinning when pushing from command palette 2018-06-17 18:14:37 -07:00
Nahom Abi
04aba36883 Remove inline git revert confirmation alert (Issue #43625) 2018-06-15 15:36:33 -07:00
Joao Moreno
57aabf1c42 smoketest: more debug 2018-06-08 21:48:46 +02:00
Joao Moreno
b48174153e git: parenthesis 2018-06-08 21:24:58 +02:00