Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 01:58:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
113,384 Commits 3,656 Branches 358 Tags
7d7dfa8f3e5b83ec69d0b8bf2ea61ba4e44a6b72
Commit Graph

2224 Commits

Author SHA1 Message Date
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
Dirk Baeumer
21991b4912 Move to latest vscode-nls for corrupted cache support 2018-07-03 16:12:52 +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
Joao Moreno
534060f381 smoketest: more debug 2018-06-08 21:24:15 +02:00
Joao Moreno
1ceb8d6d22 smoketest: more logging 2018-06-08 21:00:10 +02:00
Joao Moreno
c6b40b8f63 smoketest: add logging 2018-06-08 20:08:34 +02:00
wistcc
d6d07424ae Allowing disable the submodule auto detection warning 2018-06-04 20:24:41 -04:00
Mrigank Krishan
d1ba7ad761 minor improvements 2018-06-05 00:43:22 +05:30
João Moreno
4e26c330a8 Merge pull request #46066 from ddruker/ddruker/differentiate-foreground-color-git 
[GIT EXTENSION] Add Custom Foreground Color for Files Added to Index
 2018-06-04 17:21:14 +02:00
Joao Moreno
32d319c0dd 💄 2018-06-04 16:57:24 +02:00
Joao Moreno
495906f0cf Merge commit 'refs/pull/45254/head' of github.com:Microsoft/vscode into pr/45254 2018-06-04 16:50:58 +02:00
Joao Moreno
c693ba29c3 git: 💄 no_push feature 2018-06-04 16:48:47 +02:00
Joao Moreno
fb29dd0706 Merge commit 'refs/pull/45341/head' of github.com:Microsoft/vscode into pr/45341 2018-06-04 16:33:06 +02:00
Martin Aeschlimann
439ac990c3 Merge pull request #51026 from Hirse/master 
Add gitignore language
 2018-06-04 11:10:03 +02:00
Cherry Wang
749a1bfeee Markdown and common toolbar icons consistency pass (#50484) 
* arkdown and common toolbar icons consistency pass

* Fixed icon size related css

* fix merge issue

* flip
 2018-06-03 11:32:59 +02:00
Jan Pilzer
f3874f1bae Add gitignore language 2018-06-02 19:28:58 -07:00
Joao Moreno
30317e97bd beware of keybinding command null arguments 
fixes #50821
 2018-06-01 14:11:54 +02:00
Joao Moreno
98601ceb2c careful with path comparisons on windows 
related to #50760
 2018-05-30 09:21:46 +02:00
Morten Henriksen
83da71325c Add branch name validation and whitespace config 
* Adds `git.createBranchNameConvention.regexp`
* Adds `git.createBranchWhitespaceChar`

Fixes #50241
 2018-05-29 19:55:41 +02:00
Beau Allison
914c8789ad Align GIT light colored check icon with dark 2018-05-27 11:16:57 +01:00
Zhuowei Zhang
325a919569 git: Detect conflict markets in BOTH_ADDED files when staging 
The existing code only checked for conflict markers for files with BOTH_MODIFIED
status; files with BOTH_ADDED status were always detected as conflicting even after
conflicts are resolved.

This fixes #44106.
 2018-05-21 21:57:18 -04:00
Alex Ross
375411e631 Fixes #48714: Added conversion from local case of the file to git case. This does not fix the view in the Explorer, but this solution should be easy to apply to that issue too. 2018-05-07 11:37:17 -07:00
Joao Moreno
ee582714b6 git: cleanup ipc handles on deactivate 
related to #7758
 2018-05-03 09:12:05 +02:00
Howard Chen
a5f304f5f1 Await git.pullFrom and gitt.pushTo to ensure any failures display an error dialog to the user 2018-04-28 21:06:17 -07:00
Joao Moreno
02bcbbc8da pick different folder names for git clone 
fixes #48485
 2018-04-26 11:33:55 +02:00
Joao Moreno
d1380912cf use native dialog for git clone 
fixes #48492
 2018-04-26 11:33:16 +02:00
Joao Moreno
f765117b95 add workspace folder after git clone 
fixes #48738
 2018-04-26 11:20:06 +02:00
Joao Moreno
c2f0c40f25 use progress notification API for git clone 
fixes #48692
 2018-04-26 10:12:30 +02:00
Ramya Achutha Rao
1139de12c0 Create appInsights client only if user has opt-in to telemetry 2018-04-25 15:21:15 -07:00
Joao Moreno
5ded9d963a cleanup git clone error 
fixes #48486
 2018-04-25 19:31:05 +02:00
Joao Moreno
8b69e6db6b fixes #46854 2018-04-25 15:40:45 +02:00
Joao Moreno
7cf50421da fixes #48211 2018-04-25 09:04:41 +02:00
Peng Lyu
c69deaccd0 activate git by * 2018-04-23 17:58:54 -07:00
Joao Moreno
35f1c86f16 fix compile error 2018-04-23 16:30:17 +02:00
Joao Moreno
56ad4b3953 clone repo by url 2018-04-23 16:20:08 +02:00
Ramya Achutha Rao
0c47c04e85 Add missing yarn updates 2018-04-21 20:44:21 -07:00
Ramya Achutha Rao
953cdf7f3d Update vscode-extension-telemetry version 2018-04-20 10:30:05 -07:00
wbarajas@umich.edu
6c9265e2fd Merge branch 'master' of https://github.com/wmb0117/vscode 2018-04-16 22:36:36 -04:00