development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-13 23:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
90733 commits 1119 branches 299 tags 1.2 GiB
Commit graph

527 commits

Author SHA1 Message Date
skprabhanjan 1556800102 Fix fix-64077 With a setting 2019-08-08 16:14:23 +05:30
Joao Moreno 6af97c8756 💄 2019-08-08 12:02:55 +02:00
Joao Moreno 273cca4ac8 Merge commit 'refs/pull/70536/head' of github.com:microsoft/vscode into pr/70536 2019-08-08 11:57:25 +02:00
Joao Moreno 181759fe6a add git.smartCommitChanges 2019-08-08 11:55:13 +02:00
Joao Moreno 3dc34be7ae Merge commit 'refs/pull/70539/head' of github.com:microsoft/vscode into pr/70539 2019-08-08 11:34:18 +02:00
Joao Moreno fa5c79386c git: promptToSaveFilesBeforeCommit should have more options 
related to #66296
 2019-08-08 11:30:25 +02:00
Joao Moreno 54c6639bf8 add git.supportCancellation setting 2019-08-06 14:15:47 +02:00
João Moreno a3984f7371
Merge pull request #63743 from mIkhail-zaretsky/disable-smart-commit 
'suggestSmartCommit' configuration setting was introduced
 2019-08-05 17:29:53 +02:00
Pine Wu d44f9dae34 Use array of string for applicable builtin settings 2019-07-17 15:07:31 -07:00
Drew Cross 528f5805e7 Updating naming scheme to match other commands 2019-07-10 20:18:15 -07:00
Drew Cross d5a83f6d38 Fixing typo 2019-07-05 10:32:29 -07:00
Drew Cross a047914487 Adding git stash drop for issue 76195 2019-06-29 07:19:20 -07:00
Xhulio Hasani 8173fb9a92 Merge branch 'master' of https://github.com/microsoft/vscode 2019-06-28 23:06:25 -04:00
Miguel Solorio 005a5e4fae Update SCM icons 2019-06-18 13:17:44 -07:00
Joao Moreno 4a3c056e9a use --follow-tags instead of --tags when pushing 
fixes #70081
fixes #75240
 2019-06-12 11:06:54 +02:00
Aurélien Pupier 7a5bca9faf Add License field to package.jsons #68423 (#68771) 
it should avoid to have "warning XXX: No license field" during yarn
build

Signed-off-by: Aurélien Pupier <apupier@redhat.com>
 2019-06-06 11:44:50 +02:00
Joao Moreno afa4faa587 fix git extension tests 2019-06-05 10:22:48 +02:00
Benjamin Pasero d78a75973c
update @types/node (#74881) 2019-06-05 10:20:01 +02:00
Xhulio Hasani c125f8ed7b added deleteTag 2019-05-26 01:20:24 -04:00
Hao Hu 2058f27615 Add git.pullTags setting 2019-05-23 11:28:28 +02:00
Sandeep Somavarapu 1fd2993b54 Fix #72185 2019-04-12 07:44:56 +02:00
Joao Moreno f50b46c334 fixes #70985 2019-03-25 11:56:30 +01:00
Joao Moreno 6824561046 fixes #70812 2019-03-20 09:34:26 +01:00
ipmsteven 4935612fe6 introduce onlyTrackedFilesCanBeAutoStaged feature flag 2019-03-14 23:23:11 -07:00
Josh Leeb-du Toit 05ed3df9b8 Add option to hide git sync button in status bar 
This PR adds the option `git.statusBarSync.enabled` which when set to `false`
will hide the `SyncStatusBar` icon that is, by default, visible in the status
bar.
 2019-03-15 17:11:32 +11:00
Joao Moreno 9fb1a067b6 Merge branch 'master', commit 'refs/pull/60640/head' of github.com:Microsoft/vscode into pr/60640 2019-03-08 10:07:10 +01:00
Joao Moreno 94f7ae74c5 fixes #69529 2019-03-05 11:15:49 +01:00
Joao Moreno 5c049a93ae fixes #68894 2019-02-19 10:58:59 +01:00
Benjamin Pasero e2d1fd06d1 debt - update extensions node dependency to 10.x 2019-02-07 08:49:36 +01:00
SteVen Batten ccdd2997a6
update AI module (#66370) 
fixes #64849
 2019-01-10 17:43:25 -08:00
Joao Moreno c4a1b80e48 fix git settings scope 2019-01-07 09:58:34 +01:00
Joao Moreno 2f82209adf 💄 cleanup git input validation rules 
#60407
 2019-01-04 17:03:11 +01:00
Joao Moreno e6878ce54f Merge commit 'refs/pull/60407/head' of github.com:Microsoft/vscode into pr/60407 2019-01-04 16:51:22 +01:00
Joao Moreno a8aa85192a Merge branch 'master', commit 'refs/pull/60387/head' of github.com:Microsoft/vscode into pr/60387 2019-01-04 16:40:21 +01:00
Joao Moreno 3d928bbb27 💄 auto fetch period 2019-01-04 16:38:12 +01:00
Joao Moreno 32d22dbace Merge commit 'refs/pull/59988/head' of github.com:Microsoft/vscode into pr/59988 2019-01-04 16:30:25 +01:00
Joao Moreno 133e999097 💄 2019-01-04 15:16:45 +01:00
Joao Moreno cf107f3c3d Merge commit 'refs/pull/59078/head' of github.com:Microsoft/vscode into pr/59078 2019-01-04 15:02:46 +01:00
Joao Moreno 9b88d30734 Merge commit 'refs/pull/59849/head' of github.com:Microsoft/vscode into pr/59849 2019-01-04 14:34:28 +01:00
Joao Moreno 349b0d454e fix git.openDiffOnClick scope 2018-12-20 10:17:26 +01:00
m.zaretski fe6864f649 'suggestSmartCommit' configuration setting was introduced 2018-11-25 17:32:09 +03:00
Joao Moreno 6052fcf07f Merge commit 'refs/pull/59735/head' of github.com:Microsoft/vscode into pr/59735 2018-11-20 09:43:16 +01:00
Joao Moreno e5406b523e introduce git.openDiffOnClick 
fixes #63005
 2018-11-19 11:54:51 +01:00
Joao Moreno eb6025ec9b git.postCommitCommand 
fixes #62058
 2018-11-19 11:54:51 +01:00
Joao Moreno d4b84e645f fix #62344 2018-11-12 11:18:58 +01:00
Joao Moreno fb9e1da186 update git iconv-lite dependency 
fixes #62272
 2018-11-05 13:39:47 +00:00
Ramya Achutha Rao a975e59eaf Update applicationInsights for #60585 2018-10-16 16:29:08 -07:00
Manjiri Tapaswi 17ef20d21d Putting back git.inputValidationLength for backward compatibility 2018-10-16 10:46:02 -07:00
Manjiri Tapaswi 75fb61aa70 Per review suggestion 2018-10-10 10:55:09 -07:00
Manjiri Tapaswi 2772e8b234 Git: Separate the commit length limit of subject line and description lines #60300 2018-10-09 16:21:56 -07:00
nesukun c8e4544542 Add entries to scm context menu for force pushing 2018-10-09 21:10:06 +01:00
Omkar Manjrekar 9983f260fe Missing comma in JSON 2018-10-09 19:02:34 +05:30
Omkar Manjrekar b2350b41bc Added commands 2018-10-08 18:18:51 +05:30
Guy Waldman ad6660d0c4 Add command to create branch from specific ref 2018-10-04 14:15:15 +03:00
Ryan Scott 373f50a102 Add git.fetchPrune to menus.menus.commandPalette 2018-10-02 18:59:15 -05:00
Vladimir Kotikov ae2d0cd96f Add option to automatically stash changes before performing git pull 2018-10-02 22:49:46 +03:00
Jeremy Shore 7761add538 Fix #57910 - Add setting for auto fetch timeout 
Finishes the race condition when either setting is changed, and then if it wasn’t disabled creates a new timeout using the new value (instead of waiting for it to go through the loop again to update).
 2018-10-01 14:35:45 -05:00
Ryan Scott 6cc0f06531 Add git.fetchPrune 2018-09-30 19:38:48 -05:00
Ramya Achutha Rao 972ee3f948 Use latest applicationinsights in extensions too 2018-09-25 16:45:00 -07:00
Johannes Rieken 6999ddbab7 update vscode-extension-telemetry 2018-09-20 12:06:55 +02:00
Joao Moreno cac9991579 fixes #56504 2018-09-19 16:23:54 +02:00
Ramya Achutha Rao d0a67178ca Update appinsights in built in extensions 2018-09-18 18:35:12 -07:00
Joao Moreno 31419e264a fixes #39048 2018-09-18 16:23:35 +02:00
Joao Moreno 8a620ab5b8 fixes #18807 2018-09-18 11:20:21 +02:00
Miguel Solorio 337c626b07 Make ignored folders darker 2018-09-13 09:44:47 -07:00
Joao Moreno 4d46fb709c cleanup git push force 2018-09-13 17:15:21 +02:00
Joao Moreno eaf1759f29 Merge commit 'refs/pull/53286/head' of github.com:Microsoft/vscode into pr/53286 2018-09-13 17:01:23 +02:00
Joao Moreno 9c06533ace Merge commit 'refs/pull/54300/head' of github.com:Microsoft/vscode into pr/54300 2018-09-13 15:55:04 +02:00
Joao Moreno 6c504e7ee3 💄 2018-09-13 15:35:58 +02:00
Joao Moreno 406f710b39 Merge commit 'refs/pull/50712/head' of github.com:Microsoft/vscode into pr/50712 2018-09-13 15:25:42 +02:00
Miguel Solorio 7f41255769 Update list colors for our light theme to pass color contrast ratio 2018-09-12 16:06:01 -07:00
Joao Moreno d880689924 git: fetch from all remotes 
fixes #56463
 2018-09-12 16:21:11 +02:00
Joao Moreno a915b67582 introduce git.fetchOnPull 
related to #56463
 2018-09-12 16:15:35 +02:00
Joao Moreno 9b0eee12d3 💄 commit empty 2018-09-12 15:46:40 +02:00
Joao Moreno e2b2b5bc9d Merge branch 'master', commit 'refs/pull/56048/head' of github.com:Microsoft/vscode into pr/56048 2018-09-12 15:37:41 +02:00
Joao Moreno b920ce8583 💄 2018-09-12 14:54:22 +02:00
Joao Moreno f82fcb8a0b Merge commit 'refs/pull/55976/head' of github.com:Microsoft/vscode into pr/55976 2018-09-12 14:50:03 +02:00
Joao Moreno 405e853713 💄 2018-09-12 12:03:08 +02:00
Joao Moreno fa1deaaa34 Merge commit 'refs/pull/52527/head' of github.com:Microsoft/vscode into pr/52527 2018-09-12 12:01:51 +02:00
Joao Moreno 7ffa9219ae fixes #52037 2018-09-12 11:55:21 +02:00
nesukun 907a021f74 Add support for force push and force-with-lease 2018-09-08 23:40:07 +01:00
Johannes Rieken c2c5819fc8 adopt vscode-nls 4.0.0 2018-09-06 14:44:33 +02:00
Morten Henriksen d6b82a56e0 Merge remote-tracking branch 'Microsoft/master' into feature/50241-Add_branch_name_validation 
* Microsoft/master: (4802 commits)
  Fixes #57415: autoSurround - rename "always" to "languageDefined"
  debug: skip over %0
  explorer view: cut down delay time till progress from 3.2s to 1.2s
  file workspace suffix is empty string
  Revert "debug: do not send terminate to EH debugging"
  Fixes #57411: Rename `autoWrapping` to `autoSurround` to avoid confusions related to text wrapping
  Fixes #57453: Avoid thinking the user typed in the find input when setting the search string value
  Synchronisation notification: - Show extension being synchronised - Delete the downloaded extensions
  [html] fix tests
  debug: do not send terminate to EH debugging
  webpack - let build fail when webpack generates an error or a warning
  [html] update service. Fixes #57445
  node-debug@1.27.6
  more complete fix for #57483
  fix #57351
  fix #57483
  fixes #56015
  dispose of RunOnceScheduler properly
  Fixes Microsoft/monaco-editor#1021: Use ProviderResult in modes.ts
  fix #55607
  ...
 2018-08-29 17:58:36 +02:00
Joao Moreno 78d61d55f4 git: use simpler versioning scheme 2018-08-22 15:09:11 +02:00
Joao Moreno ad4fecadeb git: getAPI 2018-08-21 16:04:00 +02:00
Benjamin Pasero 920defc6a6 debt - update extensions node dependency to 8.x 2018-08-14 10:44:56 +02:00
Tom Basche fd2e5ac7f8 Add the ability to push empty commits 2018-08-09 11:48:08 +10:00
Rob Lourens a0764210a8 #55478 - switch all builtin settings to 'markdownDescription' instead of 'description' where needed 2018-08-08 17:01:37 -07: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
Joao Moreno a8b426471a fixes #55696 2018-08-07 16:16:11 +02:00
Miguel Solorio e275a42448 Update Git modified color for contrast ratio, fixes #53140 2018-08-03 10:37:35 -07:00
Ramya Achutha Rao 1912c5d755 Allow extensions to log telemetry to log files #54001 2018-07-30 16:18:54 -07:00
Isidor Nikolic c1abdc1228
Merge pull request #54881 from Microsoft/misolori/a11y 
Fix color contrast issues
 2018-07-27 10:35:21 +02:00
Ramya Achutha Rao 9e411a5fd3 Renaming tag for settings for online services #54354 2018-07-26 17:21:32 -07:00
Miguel Solorio e32ea43fcb
Merge branch 'master' into misolori/a11y 2018-07-26 10:25:15 -07:00
Ramya Rao d8bf1443cf
Support tags on settings to filter in settings editor (#55094) 
* Support tags on settings to filter in settings editor

* Revert adding tags to api until we are ready
 2018-07-25 15:51:28 -07:00
Rachel Macfarlane 740d37d7dd Some setting descriptions cleanup, #54690 2018-07-25 11:02:07 -07:00
Miguel Solorio 32cf6eb0fa
Merge branch 'master' into misolori/a11y 2018-07-23 09:38:00 -07:00
Miguel Solorio 3c37960bd8 Update color to meet color contrast ratiom, fixes #52580 2018-07-19 12:58:45 -07:00
Konstantin Müller c56219e13d #54204 add commands to apply stash 2018-07-14 10:01:47 +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 80766044f3 remove command from scm title 2018-07-06 15:22:21 +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
Dirk Baeumer 21991b4912 Move to latest vscode-nls for corrupted cache support 2018-07-03 16:12:52 +02:00
wistcc 5c02579269 Adding the git.syncRebase setting 2018-06-20 21:11:36 -04:00
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
Jan Pilzer f3874f1bae
Add gitignore language 2018-06-02 19:28:58 -07: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
Ramya Achutha Rao 1139de12c0 Create appInsights client only if user has opt-in to telemetry 2018-04-25 15:21:15 -07:00
Peng Lyu c69deaccd0 activate git by * 2018-04-23 17:58:54 -07:00
Joao Moreno 56ad4b3953 clone repo by url 2018-04-23 16:20:08 +02: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
Joao Moreno ab149aba6e fixes #21146 2018-03-27 14:50:53 +02:00
David 9c848a3b8b
Merge branch 'master' into ddruker/differentiate-foreground-color-git 2018-03-19 10:16:42 -04: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
Joao Moreno 0c01c63d92 show actions in the right editor only 2018-03-19 14:26:37 +01:00
Joao Moreno f929d1cd05 Merge branch 'git_actions_context_menu' of https://github.com/nikonso/vscode into nikonso-git_actions_context_menu 2018-03-19 14:09:47 +01:00
DAVID DRUKER ab19d7b43d add custom color for files added to index 2018-03-18 14:06:12 -07:00
Shobhit Chittora 1c6aa0e93d Adds workspace config for submodules detection limit 
Closes #45266
 2018-03-14 10:09:04 +05:30
Ramya Achutha Rao 251101e6ea Use latest AI to avoid monkey patching of modules Fixes Microsoft/vscode-extension-telemetry#12 2018-02-27 13:42:26 -08:00
Joao Moreno d7df300c7a bump git version 2018-02-27 13:03:00 +01:00
Ramya Achutha Rao c1ee104fd4 Use latest version of telemetry module 2018-02-23 14:57:27 -08:00
Joao Moreno 8e746bbd4c show show git output command 2018-02-23 09:04:57 +01:00
Joao Moreno efa33330fb use png icon for git 2018-02-21 10:04:06 +01:00
Joao Moreno 86e3c7ea16 git extension icon 
related to #43978
 2018-02-20 16:47:02 +01:00
Joao Moreno a563e2cb38 consolidate git extensions 
related to #43978
 2018-02-20 16:47:01 +01:00
Bruno Ribeito 044bd99285 Fix #25541 2018-02-18 17:41:25 +00:00
Ramya Achutha Rao ad06c9c609 Update telemetry module 2018-02-17 17:27:09 -08:00
Ramya Achutha Rao 994bfe6903 Update telemetry module to fix issue of missing version in events 2018-02-13 17:07:30 -08:00
Joao Moreno e2aac2a65d related to #42532 2018-02-08 17:23:43 +01:00
Joao Moreno b34b376061 fixes #42532 2018-02-08 16:32:40 +01:00
Joao Moreno f41136f5c0 fixes #43066 2018-02-08 11:38:37 +01:00
Joao Moreno 611f54ad40 fixes #40421 2018-02-01 10:00:56 +01:00
Joao Moreno 2d4b6e9124 fixes #40947 2018-02-01 09:40:22 +01:00
Joao Moreno b543a60cff Merge branch 'scm-input-validation-provider' 2018-01-30 19:37:49 +01:00
Joao Moreno 985962d2a2 Revert "provide original english translations for git" 
This reverts commit b0e3568730.
 2018-01-30 09:41:14 +01:00
Dirk Baeumer e91b851ca8 Upgrade to latest language pack format 2018-01-30 00:11:57 +01:00
Ramya Achutha Rao 71c3b15465 Update the telemetry module used by extensions 2018-01-29 14:53:24 -08:00
Joao Moreno b0e3568730 provide original english translations for git 
related to #39778
 2018-01-29 18:37:35 +01:00
Joao Moreno 888f74495d lineWarningLength -> validationProvider 2018-01-26 16:43:53 +01:00
Joao Moreno 786ea020f7 optionally show Open File action 
fixes #41137
 2018-01-26 15:29:21 +01:00
Joao Moreno 41886d2793 fix smoketests 2018-01-26 11:36:40 +01:00
Dirk Baeumer 04594c864b Add support for Language Packs 2018-01-25 21:14:34 +01:00
Joao Moreno 590d36f948 fixes #40439 2017-12-18 16:04:24 +01:00
Joao Moreno f6ee190cf7 fixes #36885 2017-12-15 15:39:01 +01:00
Joao Moreno 9622ada626 find git in LocalAppData and PATH, win32 
fixes #40229
 2017-12-15 10:38:02 +01:00
Joao Moreno 3017bc0f9c git submodule decorations 2017-12-14 12:03:54 +01:00
Joao Moreno 7ae85acb65 Merge branch 'newAutoRepositoryDetection' of https://github.com/BattleBas/vscode into BattleBas-newAutoRepositoryDetection 2017-12-11 17:42:25 +01:00
Joao Moreno 6e5e8abb16 fixes #35031 2017-12-04 15:16:07 +01:00
Joao Moreno 9544e5faa0 git.enabled as a resource setting 
fixes #37492
 2017-11-27 16:08:15 +01:00
Joao Moreno e69ca9ff85 cleanup git commands enablement 2017-11-27 16:08:15 +01:00
Joao Moreno 629ad31204 fix git commands 2017-11-27 16:08:15 +01:00
Joao Moreno 548bfe91af disable auto fetch 
fixes #34684
 2017-11-24 11:12:45 +01:00
Joao Moreno 000325a03b alert when git is missing 
fixes #38393
 2017-11-17 11:35:49 +01:00
Joao Moreno 12c41aa9bd Merge branch '34527' of https://github.com/raouldc/vscode into raouldc-34527 2017-11-10 17:03:06 +01:00
Joao Moreno 57b2a86868 Merge branch 'justinhhorner-git-rename-branch' of https://github.com/justinhhorner/vscode into justinhhorner-justinhhorner-git-rename-branch 2017-11-10 16:51:44 +01:00
Joao Moreno 2f3b485b92 compile stuff 2017-11-09 18:32:05 +01:00
Joao Moreno d1b9a70d17 git: data uris 2017-11-09 17:54:00 +01:00
Joao Moreno 948c568872 💄 2017-11-08 12:24:24 +01:00
Joao Moreno 07885099aa Merge branch '31055-Sync-Rebase' of https://github.com/excerebrose/vscode into excerebrose-31055-Sync-Rebase 2017-11-08 12:20:10 +01:00
Matt Bierner b743e245ad Enable strict compilation settings in git extension 
Enables strict checks in the git extensions
 2017-11-06 13:33:22 -08:00
Benjamin Pasero 1b36db4a99 ⬆️ iconv-lite@0.4.19 2017-11-06 10:51:52 +01:00
Joao Moreno 16692ae72c fixes #37226 2017-11-01 16:08:08 +01:00
Johannes Rieken fe3f6cc861 fix #37331 2017-11-01 15:41:06 +01:00
Johannes Rieken 5efffdfcb4 add git.decorations.enabled setting, #37299 2017-11-01 14:44:50 +01:00
Johannes Rieken 1cafd15b44 fix #37403 2017-11-01 14:18:24 +01:00
Johannes Rieken f502f70345 deco - align git color names 2017-10-30 16:44:51 +01:00
isidor 3e3d09021d also use darker red for git deleted 2017-10-25 17:24:24 +02:00
isidor 5d93cd1543 git color decoration: a bit different colors for light theme 2017-10-25 17:20:44 +02:00
Johannes Rieken a0c26c8a1d deco - show badge in scm viewlet when no icons are provided 2017-10-24 17:58:04 +02:00
Johannes Rieken 5faa72ac39 deco - use a color for ignored files 2017-10-18 09:03:15 +02:00
BattleBas 6c40a968f4 Added setting "git.autoRepositoryDetection" 
When opening just one file, the setting "autoRepositoryDetection" allows the user to control whether the entire repository changes will be displayed or just the changes of the current file.
 2017-10-12 20:19:07 -05:00
Joao Moreno 3070c0bb66 Merge branch 'dirtydiff' 2017-10-12 16:07:31 +02:00
Johannes Rieken f813a949c1 adjust scm colors 2017-10-12 14:47:02 +02:00
Joao Moreno 7d729c9d17 diff: inline actions 2017-10-11 15:16:47 +02:00
Johannes Rieken a34ee0c5aa label tweak 2017-10-10 17:09:36 +02:00
Johannes Rieken 9c4052804d adjust git colors 2017-10-10 17:09:35 +02:00
Johannes Rieken e73da33e4f add back untracked color, remove suffix for now 2017-10-10 17:09:35 +02:00
Johannes Rieken 73164106d5 simplify git decorations... 2017-10-10 17:09:34 +02:00
Johannes Rieken 5c109769f0 use ColorIdentifier instead of Color, define some git colors for untracked, modifed, and ignored 2017-10-10 17:08:53 +02:00
Joao Moreno bb23d1244e lock git @types deps 
related to #35561
 2017-10-04 13:38:41 +02:00
Joao Moreno bcb3e0d00e detect conflict markers when staging 
fixes #33983
 2017-10-03 10:21:20 +02:00
Joao Moreno a13fdcbf50 Repository.close 
fixes #35041
 2017-09-28 11:09:44 +02:00
Raoul D'Cunha 21aac84936 Add support for Stash (Include Untracked) 2017-09-20 17:06:52 +12:00
isidor 1559b68d09 git: open change enabled only for local files 2017-09-15 10:49:31 +02:00
Joao Moreno b1a7be798e add git.stageAll to provider menu 
related to #34230
 2017-09-13 09:18:09 +02:00
Joao Moreno c9e070991a remove close repo command 2017-08-31 16:12:10 +02:00
Joao b4fa7f2e27 fixes #33499 2017-08-30 15:25:15 +02:00
Joao 5b265e0cab fixes #33341 2017-08-30 13:02:20 +02:00
Joao 8f8bbff336 fixes #33325 2017-08-29 15:06:57 +02:00
Joao 2624eff8fe Merge branch 'master' into scm-multiroot 2017-08-25 11:36:39 +02:00
Joao Moreno e9798613ad git: gitOpenRepositoryCount 2017-08-23 16:25:20 +02:00
Joao Moreno ca068b3695 fix git.pullFrom group 2017-08-23 15:55:41 +02:00
Justin Horner e34b313026 Merge branch 'master' into justinhhorner-git-rename-branch 2017-08-21 22:51:06 -04:00
Joao Moreno 071652f161 git: improved discard all 2017-08-21 11:48:35 +02:00
Joao Moreno f8fcaf44fc git: open file, open changes 2017-08-15 18:49:26 +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 bbe70bc9b9 fixes #32459 2017-08-15 11:31:45 +02:00
Krzysztof Cieślak 13484ae98d Add commands 2017-08-14 22:30:50 +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
Justin Horner b3a977e32a Add rename branch command 2017-08-10 14:00:27 -04: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
Harjyot Singh 3085d3ebd7 Command added 2017-07-26 03:36:26 +05:30
Daniel Portella ff1d9f13c6 added Config information 
Ticket #5065
 2017-07-11 17:09:36 +01:00
kieferrm 3f8bd163f4 update dependency on vscode-extension-telemetry 2017-06-30 09:57:37 -07:00
Joao Moreno 91a02c7a0a 💄 2017-06-26 16:14:29 +02:00
Joao Moreno 2f54b0001b Merge branch 'feature-git-open-old-file' of https://github.com/Duroktar/vscode into Duroktar-feature-git-open-old-file 2017-06-26 16:09:44 +02:00
Joao Moreno 417cdb62b7 git.pullFrom 
octopus commit
 2017-06-26 15:46:51 +02:00
Joao Moreno 5f31035e46 Merge branch 'git_pull_from' of https://github.com/Krzysztof-Cieslak/vscode into Krzysztof-Cieslak-git_pull_from 2017-06-26 15:36:17 +02:00
Joao Moreno 53ce1b0b46 Merge branch 'master' of https://github.com/matthewshirley/vscode into matthewshirley-master 2017-06-26 15:36:00 +02:00
Joao Moreno 14380f9766 Merge branch 'bc/Feature26738' of https://github.com/BugraC/vscode into BugraC-bc/Feature26738 2017-06-26 15:34:26 +02:00
Joao Moreno f23a32b7a7 Merge branch 'git-merge' of https://github.com/gecharo/vscode into gecharo-git-merge 2017-06-26 09:56:42 +02:00
Krzysztof Cieślak f9f13f3be9 Add pullFrom command to package.json 2017-06-23 11:16:05 +02:00
Krzysztof Cieślak 0636016735 Add git amend commands in package.json 2017-06-22 14:22:35 +02:00
NKumar2 9aaeb1989a Registering and handling commad 2017-06-21 19:51:38 -07:00
Joao Moreno 5667cc0e69 use vsce to determine what to package when bundling extensions 
fixes #29054
 2017-06-21 16:17:21 +02:00
Bugra Cuhadaroglu 39f33ae2ae Git: Pull from specific branch 2017-06-20 19:52:47 -07:00
Christof Marti 89fa243fc9 Hid Git actions from merge conflict (fixes #27563) 2017-05-31 10:28:15 -07:00
Maik Riechert b96478ebcc add git delete branch command 2017-05-26 09:27:24 +02:00
Matt Shirley 42ab4c41a4 Add "pullFrom" git command 
Resolves Microsoft/vscode#26738
 2017-05-20 11:07:34 -07:00
Ashutosh Dhundhara 211e7a3030 [#25575] Add Git Tag feature. 2017-05-20 23:04:30 +05:30
Duroktar 54da9357ba add "open old file" git command 
this implements #23011
 2017-05-14 22:03:38 -03:00
Joao Moreno 0dcb957f4c Merge branch 'Issue15613_AllFilesCommitted' of https://github.com/seesemichaelj/vscode into seesemichaelj-Issue15613_AllFilesCommitted 2017-05-04 16:32:37 +02:00
Joao Moreno af6f8aa748 clean up #24950 2017-05-04 16:04:30 +02:00
Joao Moreno b94f56f7cc Merge branch 'git-default-branch-directory' of https://github.com/ihalip/vscode into ihalip-git-default-branch-directory 2017-05-04 16:00:45 +02:00
Rokas Gečas 818fa5a50f #10542 Ability to merge local git branches 2017-05-01 16:44:00 +03:00
Joao Moreno f0fe019745 🐛 remove git init icon 
fixes #21103
 2017-04-27 11:25:45 +02:00
Joao Moreno 4e636bf50f 🐛 fixes #24052 2017-04-26 17:55:44 +02:00
Mike Seese 5d323a3eca Add git enableSmartCommit setting 
If false, this setting will prompt the user if they want to commit all files if none are staged
 2017-04-25 23:13:07 -04:00
Joao Moreno a199b2aa53 ✨ merge git.open* commands 2017-04-24 11:47:09 +02:00
Joao Moreno 7cf0ad0440 Merge branch 'git-encoding' of https://github.com/igelbox/vscode into igelbox-git-encoding 2017-04-24 10:25:45 +02:00
Ilie Halip db4208013f Merge remote-tracking branch 'upstream/master' into git-default-branch-directory 2017-04-19 18:49:50 +03:00