Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-26 09:45:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,823 Commits 5,305 Branches 393 Tags
4d81a85f22a395f1b90b277f6eec0794de577184
Commit Graph
998 Commits
Author SHA1 Message Date
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
wbarajas@umich.edu 2c2122ee5d feature: add support to manually add repositories 2018-04-16 22:35:18 -04:00
Sandeep Somavarapu e592885b49 Fix #46750 2018-04-16 17:10:46 +02:00
Adit Bhatt 59c06466c2 feat: add support for ignored repositories list 2018-04-14 22:55:23 -04:00
Pradeep Murugesan f1a362b250 Commit always using sign off flag setting 47395 2018-04-13 11:28:35 +02:00
Ivor Huang ee748ab5c8 implement push success notification for issue #39039 2018-04-12 20:48:31 -04:00
Ryuichi Inagaki a02823851b ref #44776 Removed the test for deleteRef method 
* as we don't use stub in test
 2018-04-11 20:03:57 +10:00
Ryuichi Inagaki 6b7a644082 ref #44776 Only test the logic of parsing git show output 
* Instead of testing it through `getCommit` as we don't use stub in test
 2018-04-11 20:02:20 +10:00
Ryuichi Inagaki 278842c987 ref #44776 deleteRef instead of reset if commit has no parents 2018-04-10 21:01:56 +10:00
Ryuichi Inagaki 81b3b44413 ref #44776 Added DeleteRef operation 2018-04-10 21:01:56 +10:00
Ryuichi Inagaki 91414f62cf ref #44776 Introduced deleteRef method on git.Repository 2018-04-10 21:01:56 +10:00
Ryuichi Inagaki 963d337689 ref #44776 Refactoring test 2018-04-10 21:01:56 +10:00
Ryuichi Inagaki ac63779dca ref #44776 Cater for the cases of multiple/no previous hashes 2018-04-10 21:01:55 +10:00
Ryuichi Inagaki 3fdf0bcc56 ref #44776 Get previous commits as part of commit info 2018-04-10 21:01:41 +10:00
Ryuichi Inagaki d562ebbf25 ref #44776 Wrote a test for Repository#getCommit 2018-04-10 20:37:36 +10:00
Pradeep Murugesan a8803b4543 #47041 fixed the scrolling of the editor and cursor after the revert from inline diff viewer 2018-04-05 15:15:02 +02:00
Florian Traber 67b3957473 #46860 make git delete popup modal 2018-04-01 09:39:41 +02:00
Joao Moreno 42c882151f only detect git encoding if files.autoGuessEncoding is enabled 
fixes #46826
 2018-03-28 12:52:10 +02:00
Joao Moreno dafdde11c9 fixes #45911 2018-03-28 09:56:58 +02:00
Joao Moreno ab149aba6e fixes #21146 2018-03-27 14:50:53 +02:00
Joao Moreno ee25b62029 fixes #46144 2018-03-20 10:17:01 +01:00
David 9c848a3b8b Merge branch 'master' into ddruker/differentiate-foreground-color-git 2018-03-19 10:16:42 -04:00
Joao Moreno 27c68d9258 :liptstick: 2018-03-19 14:30:31 +01:00
Joao Moreno 1d0271f486 Merge branch 'submodule-limit-workspace-setting' of https://github.com/shobhitchittora/vscode into shobhitchittora-submodule-limit-workspace-setting 2018-03-19 14:28:29 +01:00