Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 19:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,524 Commits 3,674 Branches 359 Tags
4e2b303e292be0558aeb14ccd848747ffb3ff2e6
Commit Graph

329 Commits

Author SHA1 Message Date
Eric Amodio
6836261663 Adds workspace trust setting 2021-04-19 11:53:57 -04:00
Rachel Macfarlane
e3829dc247 Add 'prune' option to fetch in git extension API (#117923) 
Add 'prune' option to fetch in git extension API
Add overload to fetch to pass options
 2021-03-02 15:18:59 -05:00
Eric Amodio
2fda718ad7 Fixes #115801 - improves conflict decorations 2021-02-04 17:25:48 -05:00
João Moreno
06c0dbe616 fix compilation error 2021-02-03 13:43:03 +01:00
Eric Amodio
5bcd222075 Fixes checking for rebase against wrong branch 
Refs: #1866
 2021-01-21 00:29:16 -05:00
Eric Amodio
21c11ba864 Fixes #114433 - adds setting to avoid git config 2021-01-15 14:05:55 -05:00
Eric Amodio
d076ee1b94 Adds force push mode to push api 2021-01-13 00:42:07 -05:00
Eric Amodio
8832366467 Closes #110881 - adds possibly rebased warning 2021-01-12 12:15:39 -05:00
joan xie
1bb2ae0e36 Allow ResourceCommandResolver.getRightResource() to return undefined (#113364) 2021-01-05 01:05:23 -05:00
João Moreno
0c947cb4ee fixes #96264 2020-12-04 11:43:10 +01:00
João Moreno
62e830be77 Git/SCM: Use vscode.open and vscode.diff for a better editor opening experience (#110733) 
* wip: try to use vscode.open and vscode.diff in git/scm

related to #110397

* 💄

* revert change to commands.converter.toInternal

* complete usage os vscode.open and vscode.diff in git extension
 2020-11-16 16:19:26 +01:00
João Moreno
e8b69537cd fixes #40295 2020-11-10 13:54:53 +01:00
João Moreno
91aa548b05 Merge branch 'master' into pr/104614 2020-11-09 16:34:21 +01:00
João Moreno
98e0e93ae0 💄 2020-11-09 16:19:13 +01:00
João Moreno
c96f362934 Merge branch 'master' into pr/99324 2020-11-09 16:17:36 +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
592fa5cdaf Merge branch 'master' into pr/97486 2020-11-09 14:29:59 +01:00
João Moreno
ce4fb6e323 fixes #96264 2020-11-06 14:45:26 +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
4f038dba60 💄 2020-11-04 15:25:52 +01:00
João Moreno
e61be087c6 Merge branch 'master' into pr/88772 2020-11-04 15:06:31 +01:00
João Moreno
7936093c33 git: merge resources should return undefined original resource 
related to #109022
 2020-11-03 14:33:18 +01:00
João Moreno
42e920a18a Merge branch 'master' into pr/108913 2020-10-23 14:32:22 +02:00
João Moreno
a27961d843 git: improve status bar message 2020-10-21 16:37:49 +02:00
tomerstav
5a76fea0a8 Rewrote logic 2020-10-19 23:24:48 +00:00
Ladislau Szomoru
e1692b33b1 Abort rebase command polish (#108919) 
* Abort rebase command polish
 2020-10-19 10:59:36 +02:00
tomerstav
741925db11 Implemented rebase onto 2020-10-19 04:13:52 +00:00
João Moreno
5a18ae699c 💄 2020-09-28 16:33:29 +02:00
Michael Wood
b8c953da4b Merge branch 'master' into 99129-theme-colour-git-staged 2020-09-28 08:02:47 +02:00
Johannes Rieken
b241d4cd1f fix typo, https://github.com/microsoft/vscode/issues/54938 2020-09-25 16:26:52 +02:00
Johannes Rieken
8932f62afa adress API feedback https://github.com/microsoft/vscode/issues/54938 2020-09-25 16:13:26 +02:00
michaelwood@onetrail.com
536652aab5 added additional colour options for differing git staging statuses 2020-09-23 20:31:30 +02:00
ChaseKnowlden
e8760a5d6c Fix capitalization of GitHub org 2020-09-17 11:43:03 +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
1ab3137674 git: PushErrorHandler 2020-07-15 15:52:31 +02:00
João Moreno
f457cf5310 fixes #101078 2020-07-01 09:37:23 +02:00
João Moreno
57f08f6b74 Merge pull request #101114 from daniel-j-davis/feature/add-git-squash-message 
Adding .git/SQUASH_MSG detection to commit message auto-fill #101078
 2020-06-29 16:16:34 +02:00
João Moreno
e0d4a2fe2d git: lighter warning 2020-06-26 23:32:40 +02:00
Daniel Davis
df1575d529 Changing return type back 2020-06-26 16:57:57 +01:00
Daniel Davis
b3c2e36cd4 Changing commit message auto-fill to use the first non-undefined message 2020-06-26 16:55:25 +01:00
Daniel Davis
7bb8f9103e Changing commit message to use Promise.race instead of bad comparison 2020-06-26 14:03:43 +01:00
Daniel Davis
05e719bede Changing auto-fill commit message to check for getMergeMessage OR getSquashMessage 2020-06-26 13:26:40 +01:00
Daniel Davis
3f90d90ab2 Adding .git/SQUASH_MSG detection to commit message autofill 2020-06-26 12:35:32 +01:00
João Moreno
0bf3a85363 fix scm input visibility 2020-06-25 12:16:36 +02:00
João Moreno
bdcb290645 ux 2020-06-24 11:11:34 +02:00
João Moreno
3625061201 styling, menus 2020-06-23 19:57:46 +02:00