development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
121938 commits 1044 branches 294 tags 1.3 GiB
Commit graph

365 commits

Author SHA1 Message Date
João Moreno e81eb57671 Merge branch 'master' into pr/107705 2020-11-23 11:33:12 +01:00
João Moreno 13f9f73353
💄 2020-11-10 11:41:40 +01:00
João Moreno 1d18ebe47e
Merge branch 'master' into pr/107074 2020-11-10 11:33:25 +01:00
João Moreno 91aa548b05 Merge branch 'master' into pr/104614 2020-11-09 16:34:21 +01:00
João Moreno 309cabdf51 💄 2020-11-09 16:08:03 +01:00
João Moreno 978d39324a Merge branch 'master' into pr/104312 2020-11-09 16:03:36 +01:00
Scott Davis 7e5609afa9
feat: implement Git: Push Tags command (#110096) 
Related to #109799
 2020-11-09 16:00:44 +01:00
João Moreno 86d848d8e7 💄 2020-11-09 14:45:36 +01:00
João Moreno 592fa5cdaf Merge branch 'master' into pr/97486 2020-11-09 14:29:59 +01:00
João Moreno dd97a9d335 💄 2020-11-09 14:23:24 +01:00
João Moreno 147f623629 Merge branch 'master' into pr/97322 2020-11-09 11:39:49 +01:00
dfireBird 024df33553 feat: add setting for default stash message 2020-11-07 08:56:48 +05:30
João Moreno ce4fb6e323
fixes #96264 2020-11-06 14:45:26 +01:00
João Moreno e3ace1fe1f
Merge branch 'master' into pr/94369 2020-11-05 15:56:26 +01:00
João Moreno 08d271585d
💄 2020-11-05 15:33:07 +01:00
João Moreno e5285908ca
💄 2020-11-04 15:42:40 +01:00
João Moreno 90aa30e660
Merge branch 'master' into pr/89249 2020-11-04 15:38:53 +01:00
João Moreno e61be087c6
Merge branch 'master' into pr/88772 2020-11-04 15:06:31 +01:00
Takanori Oishi 86e1d0744f
Git: Add tags to '...' menu (#109282) 
* Git: Add tags to '...' menu
Closes #109281

* Git: Add tags to '...' menu
Closes #109281
 2020-10-26 14:44:28 +01:00
João Moreno 42e920a18a
Merge branch 'master' into pr/108913 2020-10-23 14:32:22 +02:00
tomerstav 7b936983f6 Renamed rebaseOnto to rebase 2020-10-23 03:35:27 +00:00
João Moreno 0f1904834b
💄 2020-10-22 21:12:13 +02:00
Jordan Bayles 3082f63523 Add Git: Clone Recursively option 
This patch adds a new command, Git: Clone Recursively, that adds the
--recursive option to git clone in order to also check out git
submodules.

Bug: 108381
 2020-10-21 23:05:48 -07:00
tomerstav 741925db11 Implemented rebase onto 2020-10-19 04:13:52 +00:00
Sebastian Andil 6f4409deae
Fix typo (#108329) 2020-10-09 16:28:58 +02:00
Eric Amodio d8b1776ccb Closes #97407, #93405 2020-10-09 02:31:48 -04:00
gjsjohnmurray ceeb974856 Wire up preconditions for viewsWelcome buttons, and use it 2020-09-30 13:01:46 +01:00
gjsjohnmurray af4fb00687 Initial 'Git extension is activating...' in SCM view 2020-09-30 06:49:32 +01:00
gjsjohnmurray 4e00a9b1a5 fix #106487 Contribute an "activating" placeholder message and button 2020-09-29 15:23:07 +01:00
João Moreno 5a18ae699c
💄 2020-09-28 16:33:29 +02:00
michaelwood@onetrail.com 536652aab5 added additional colour options for differing git staging statuses 2020-09-23 20:31:30 +02:00
WhizSid c334da1952
Multi git executable paths (#85954) 
* Multi git executable path

* update `git.path` setting description

* 💄

Co-authored-by: João Moreno <joao.moreno@microsoft.com>
 2020-09-10 15:02:37 +02:00
Vyacheslav Pukhanov 663810e275
Adds commands for --no-verify commit variants (#106335) 
* add `{allow,confirm}NoVerifyCommit`  options

* adds commit comands with no verify

* handles no verify command variants

* handle no verify commit option

* only display no verify variants when option is set
 2020-09-10 11:14:28 +02:00
João Moreno 82aa8fc425
better git and github docs 2020-09-08 09:55:07 +02:00
Marvin A. Ruder 8d2ff254c1
Changed description of “Commit Signing” setting label to include X.509. 2020-08-22 21:52:04 +02:00
sneakyfish5.sneaky@gmail.com ff8d4feeb4 Git: Add cherryPick command 2020-08-09 16:51:37 -05:00
unknown b4c528cbfd fixes #103281 2020-08-08 14:05:51 -05:00
João Moreno 2f2ba0d764
fixes #102455 2020-08-05 12:09:17 +02:00
João Moreno 22ff86bac3 fixes #102109 2020-07-31 15:38:16 +02:00
kingwl 3f585d7400 Add better support for checkout type config 2020-06-05 17:41:59 +08:00
Pascal Fong Kye d2b5d323d0 feat:new command stage all merge 2020-05-24 21:58:24 +02:00
João Moreno 0700c9ea43
git: contributable add remote 2020-05-20 11:37:53 +02:00
João Moreno a85a2e6044 move credential provider to github 2020-05-18 21:04:29 +02:00
kingwl b24cb8b47d Add rename by git context menu 2020-05-11 19:01:45 +08:00
Ladislau Szomoru ee8a6bc4f8
Git: Add "git rebase --abort" command (#97071) 
Add "git rebase --abort" command
 2020-05-07 14:26:55 +02:00
João Moreno 0209826b56 fixes #96399 2020-04-28 15:09:38 +02:00
João Moreno 8ff93b98c5 git: config.githubAuthentication 2020-04-27 14:57:47 +02:00
João Moreno 54d8261f93 git: config.terminalAuthentication 2020-04-27 14:57:47 +02:00
Jacob 1243ff76e4 Changed name of the setting to openAfterClone 2020-04-22 14:27:55 +02:00
Jacob b64cb1ecf4 Merge branch 'master' of https://github.com/microsoft/vscode 2020-04-22 14:15:22 +02:00
João Moreno 968de61532 Merge commit 'refs/pull/81982/head' of github.com:microsoft/vscode into pr/81982 2020-04-20 14:25:59 +02:00
bkis 433380c3c1
Fix typo in git extension's config description (#94993) 2020-04-11 06:45:15 -07:00
Jacob 156d5ab281 Added setting for opening cloned repository without prompt. #93300 2020-04-03 13:43:50 +02:00
Joao Moreno 50ec1b1b33
fixes #91070 2020-02-27 08:37:34 +01:00
Joao Moreno d43bb97bb0
git: contribute Clone to explorer 2020-02-19 12:23:02 +01:00
Joao Moreno e7ebb137b7
git: easy case for git init 2020-02-19 11:59:27 +01:00
Joao Moreno 27606615ba
rewrite 2020-02-19 11:59:25 +01:00
Joao Moreno cce81b98b9
Merge branch 'joao/empty-views-api' 2020-02-17 12:05:37 +01:00
Eric Amodio 9ae0fd36c9 Enhances timeline - commands, timestamp, etc 
Adds contributable commands to timeline items
Adds right-aligned timestamp to timeline items
Adds Open Changes to Git timeline items
Adds Copy Commit ID to Git timeline items
Adds Copy Commit Message to Git timeline items
 2020-02-14 15:22:45 -05:00
Joao Moreno b62b2280ea
fixes #90620 2020-02-14 07:24:17 +01:00
Joao Moreno eab81b4a31
git missing docs 2020-02-13 16:53:08 +01:00
Joao Moreno d946716fe2
improve git empty view docs 2020-02-13 16:13:10 +01:00
Joao Moreno 3e8bb6cfd4
git: more empty view documentation 2020-02-13 16:03:18 +01:00
Joao Moreno dde577b23e
activate git before smoke tests 2020-02-05 15:03:05 +01:00
Joao Moreno 06dbb1938f
make sure git is activated before integration tests run 2020-02-05 10:24:47 +01:00
Ben Curtis 33b5a9ba25
Merge branch 'master' into ignore_sub 2020-01-30 13:16:06 -05:00
Eric Amodio b861a1143d Removes open diff command from palette 2020-01-27 15:28:33 -05:00
Eric Amodio 87c2332fed Adds timeline diff on click and icon support 2020-01-27 15:28:33 -05:00
Joao Moreno 548baadc5f
git: have own log level 
related to #85992
 2020-01-27 14:40:24 +01:00
Oliver Larsson 2abdb90472 git.pruneOnFetch setting implemented 2020-01-24 21:20:44 +01:00
Fmstrat d7ed37e864 add ignoreSubmodules option 2020-01-16 09:39:19 -05:00
Joao Moreno f4f0062168 git input box shouldn't handle comments 
related to #84201
 2019-11-21 16:41:35 +01:00
Joao Moreno 3bf8e81517
fixes #85205 2019-11-20 16:25:10 +01:00
Joao Moreno fd091abb85
fixes #84274 2019-11-08 15:55:30 +01:00
Joao Moreno ad6011cb7a rename git.untrackedChanges: default to mixed 2019-10-28 10:35:56 +01:00
Joao Moreno 7da96f94c1
cleanup setting name and values 2019-10-25 16:11:36 +02:00
Joao Moreno 82abb9e56d
differentiate between tracked & untracked in staging 2019-10-25 16:01:52 +02:00
Joao Moreno 003177ea90
git.stageAllUntracked, git.cleanAllUntracked 2019-10-25 15:49:38 +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 980fb4b0ff
Merge commit 'refs/pull/76342/head' of github.com:microsoft/vscode into pr/76342 2019-10-25 11:32:15 +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
Joao Moreno 2125bcf9af 💄 2019-10-17 15:52:21 +02:00
Joao Moreno 9e5c2aca23 fixes #67814 2019-10-08 16:57:22 +02:00
Phil Marshall 963120ba87 add git.showCommitInput config option (#79074) 2019-10-04 16:35:31 -05:00
Joao Moreno ced9fdfa4f scm: folder context actions 2019-09-18 11:58:44 +02:00
Jakobeha 966e3fd070
Merge branch 'master' into hide-untracked 2019-08-29 19:12:10 -04:00
jakob 63f6496094 config option to separate or hide untracked files 2019-08-29 17:09:47 -04:00
Greg Van Liew 7ee04f67c7 Update Git count badge description 2019-08-27 12:00:50 -07:00
Xhulio Hasani 32d59ba806 Added quickpick option and display of tag annotation on menu 2019-08-20 16:05:46 -04:00
Joao Moreno 22a3f3ec83 💄 2019-08-13 09:54:20 +02:00
Joao Moreno 2c878484c8 Merge commit 'refs/pull/78695/head' of github.com:microsoft/vscode into pr/78695 2019-08-13 09:46:54 +02:00
Xhulio Hasani 98ed0fc2e8 Merge branch 'master' of https://github.com/microsoft/vscode 2019-08-11 19:50:41 -04:00
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
Drew Cross 528f5805e7 Updating naming scheme to match other commands 2019-07-10 20:18:15 -07:00
Drew Cross 11a9ac5703 Adding "..." to the end of drop stash 2019-07-03 05:36:10 -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
Joao Moreno b485ffb756 fix git nls 2019-06-12 12:02:58 +02:00
Joao Moreno 4a3c056e9a use --follow-tags instead of --tags when pushing 
fixes #70081
fixes #75240
 2019-06-12 11:06:54 +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
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 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 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
m.zaretski fe6864f649 'suggestSmartCommit' configuration setting was introduced 2018-11-25 17:32:09 +03:00
Joao Moreno 3af878c2d5 💄 2018-11-20 09:58:01 +01: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 50a4525420 fixes #60986 2018-11-01 15:59:42 +01: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
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
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
Joao Moreno 77c8657a86 improve setting description 
related to #50394
 2018-09-27 09:42:22 +02:00
Joao Moreno cac9991579 fixes #56504 2018-09-19 16:23:54 +02: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
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
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