Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 18:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
148,279 Commits 3,663 Branches 358 Tags
e4a2b6b4e8da07e612329d15b2c33d87eaa73860
Commit Graph

2954 Commits

Author SHA1 Message Date
Joao Moreno
179154d3f5 💄 2019-10-25 15:19:30 +02:00
Joao Moreno
a8b09d4711 fixed scope 2019-10-25 15:14:59 +02:00
Joao Moreno
94389f776f fix bad git package.nls.json change 2019-10-25 12:19:35 +02:00
Joao Moreno
1a071b1f79 Merge commit 'refs/pull/80083/head' of github.com:microsoft/vscode into pr/80083 2019-10-25 12:15:59 +02:00
Joao Moreno
1c19031a23 Merge remote-tracking branch 'origin/master' 2019-10-25 11:41:31 +02:00
Joao Moreno
b716ca6ae6 fix typo 2019-10-25 11:38:55 +02:00
Joao Moreno
2c0115ec8c fix compile errors 2019-10-25 11:36:06 +02:00
Joao Moreno
980fb4b0ff Merge commit 'refs/pull/76342/head' of github.com:microsoft/vscode into pr/76342 2019-10-25 11:32:15 +02:00
João Moreno
16e5fae907 Merge pull request #83257 from andrecasal/fix-git-confirmEmptyCommits-description 
Clarified git.confirmEmptyCommits description
 2019-10-25 10:46:34 +02:00
Joao Moreno
93f1e0287b git: remove bad menu 2019-10-25 09:54:20 +02:00
andrecasal
396dead18b Clarified git.confirmEmptyCommits description 2019-10-24 21:29:07 +01:00
Joao Moreno
f402575486 cleanup git delete tag command 2019-10-24 15:27:57 +02:00
Joao Moreno
23a4df3672 Merge commit 'refs/pull/74345/head' of github.com:microsoft/vscode into pr/74345 2019-10-24 15:13:29 +02:00
Anirudh Rayabharam
7b1a6c822a Git: Fixed error when staging in empty repository 
Trying to stage a commit in an empty repository (i.e. no prior commits)
results in a git fatal error. This is because in an empty repo, HEAD
doesn't point to anything causing `git ls-tree -l HEAD ...` to fail.

To fix this, send `treeish` as `'HEAD'` to `getObjectDetails()` only if
there is at least one commit in the repo. Else, send an empty string
causing `getObjectDetails()` to use `lsFiles` instead of `lsTree`.

Fixes #82026
 2019-10-21 22:04:03 +05:30
João Moreno
ad9bce8978 Merge pull request #82038 from jeanp413/fix-81158 
Fix git repository not detected if root folder ends in [space]
 2019-10-21 16:01:18 +02:00
Joao Moreno
1cd6bd6096 Revert "fixes #71355" 
This reverts commit f0772536de.

Fixes #82797
 2019-10-18 10:23:10 +02:00
Joao Moreno
f367d0fe20 skip auth only for auto fetch 
related to #72615
 2019-10-17 16:19:26 +02:00
Joao Moreno
612b072362 Merge commit 'refs/pull/72615/head' of github.com:microsoft/vscode into pr/72615 2019-10-17 16:16:36 +02:00
João Moreno
fd8383a6b0 Merge pull request #71525 from jmbockhorst/confirmUndoMerge 
Confirm "Undo last commit" if its a merge commit
 2019-10-17 07:01:23 -07:00
Joao Moreno
2125bcf9af 💄 2019-10-17 15:52:21 +02:00
Joao Moreno
1852e0c764 Merge commit 'refs/pull/71434/head' of github.com:microsoft/vscode into pr/71434 2019-10-17 15:35:22 +02:00
Joao Moreno
f901a47197 💄 git clone progress 2019-10-17 14:08:40 +02:00
Joao Moreno
471b263ce5 Merge commit 'refs/pull/71341/head' of github.com:microsoft/vscode into pr/71341 2019-10-17 12:53:45 +02:00
Joao Moreno
d5664e35ed cleanup commit template, merge 
related to #66522
 2019-10-15 17:43:33 +02:00
Joao Moreno
4a80681a01 Merge commit 'refs/pull/66522/head' of github.com:microsoft/vscode into pr/66522 2019-10-15 17:16:42 +02:00
Joao Moreno
d9e93a7067 Merge branch 'joao/fix-82264' 2019-10-15 13:03:24 +02:00
Joao Moreno
b8bc8accf5 fixes #82564 2019-10-15 11:20:07 +02:00
Joao Moreno
4a81920398 Revert "scm: make tree rendering opt-in via proposed API" 
This reverts commit afa911d942.
 2019-10-11 19:10:27 +02:00
Matt Bierner
d80739df02 Fixing TS 3.7 dom typings errors 2019-10-10 14:16:26 -07:00
Joao Moreno
afa911d942 scm: make tree rendering opt-in via proposed API 
fix #82203
 2019-10-10 18:37:38 +02:00
Daniel Imms
dfee0337a5 Merge branch 'master' into fix-executable-bits 2019-10-09 15:16:07 -07:00
Joao Moreno
d1be9d02cd 💄 2019-10-09 12:48:21 +02:00
Joao Moreno
4ce64ef558 Merge commit 'refs/pull/80335/head' of github.com:microsoft/vscode into pr/80335 2019-10-09 12:44:34 +02:00
Joao Moreno
ecea71432f fixes #73613 2019-10-09 12:36:52 +02:00
Joao Moreno
9e5c2aca23 fixes #67814 2019-10-08 16:57:22 +02:00
Niklas Mollenhauer
1cc0b592c2 Remove executable bits from non-executable files 2019-10-08 15:18:42 +02:00
Matt Bierner
4c4edcefeb Fixing more TS 3.7 related compile errors 
- Import aliasing symbol in file
- Missing function calls in conditional
- Missing return statement
 2019-10-07 11:04:31 -07:00
jeanp413
5d2eb0a06e Fixes #81158 2019-10-06 23:31:49 -05:00
Phil Marshall
1acd0359f7 remove console log 2019-10-04 16:51:58 -05:00
Phil Marshall
963120ba87 add git.showCommitInput config option (#79074) 2019-10-04 16:35:31 -05:00
Dipen Ved
6a0c40a0cc save all and commit fix 2019-09-29 19:55:17 +05:30
Matt Bierner
f7274467ca Fix compile error in extension 2019-09-25 18:57:39 -07:00
Joao Moreno
14d47d35a9 fixes #79239 2019-09-23 12:00:36 +02:00
Alexander
ce6319c76c Merge branch 'master' into git_branch_name 2019-09-22 13:17:47 +03:00
Joao Moreno
ced9fdfa4f scm: folder context actions 2019-09-18 11:58:44 +02:00
Joao Moreno
bcd7bcedff wip: scm folder menus 2019-09-18 09:49:35 +02:00
Joao Moreno
4aa94e20ed remove unused import 2019-09-17 10:30:12 +02:00
Joao Moreno
227cebfac7 fixes #80671 2019-09-17 09:58:43 +02:00
Alexander
3ff6b96ab7 Update enablement of status bar item in constructor (#80517) 2019-09-10 10:27:33 +02:00
al
6ec5f47c0b Just compare to undefined 2019-09-09 21:40:13 +03:00