Commit Graph

1634 Commits

Author SHA1 Message Date
João Moreno
0321ca5d96 fixes #106664 2020-11-27 12:22:16 +01:00
João Moreno
93f8adf263 💄 2020-11-23 11:50:16 +01:00
João Moreno
e81eb57671 Merge branch 'master' into pr/107705 2020-11-23 11:33:12 +01:00
João Moreno
76e1b21f4f fixes #110800 2020-11-19 12:20:01 +01:00
Johannes Rieken
d04f3178dc proper name for register function: registerFileDecorationProvider, #54938 2020-11-19 08:13:18 +01:00
João Moreno
3d013dc76f move git rename to command palette 2020-11-18 11:08:42 +01:00
Johannes Rieken
12b808cf08 make event optional, event naming, relax badge length a little, https://github.com/microsoft/vscode/issues/54938 2020-11-18 10:04:30 +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
Seth Fitzsimmons
217ad5ac66 Typo: Uncommited → Uncommitted 2020-11-12 15:31:30 -05:00
unknown
cc9616baf8 use 'enablement' instead of 'preconditions' 2020-11-12 08:46:41 +00:00
João Moreno
5bf6d0cabc fixes #65188 2020-11-11 16:12:01 +01:00
João Moreno
3d61a39074 fixes #103031 2020-11-10 16:52:35 +01:00
João Moreno
e8b69537cd fixes #40295 2020-11-10 13:54:53 +01:00
João Moreno
62877b66d8 Merge branch 'master' into pr/107958 2020-11-10 11:59:25 +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
6a2da6d725 💄 2020-11-10 11:28:44 +01:00
João Moreno
7200f73de2 Merge branch 'master' into pr/106368 2020-11-10 11:25:50 +01:00
João Moreno
2c1272b794 fixes #104945 2020-11-10 11:22:18 +01:00
rebornix
0efbfd9190 fix #108765. 2020-11-09 15:38:11 -08:00
rebornix
e5530fc4f0 fix #105920. 2020-11-09 11:40:07 -08: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
ec084a25bd 💄 2020-11-09 15:19:15 +01:00
João Moreno
df4524f713 Merge branch 'master' into pr/97525 2020-11-09 15:08:04 +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
dfireBird
109d9984c1 fix: commit template appears as default stash message 2020-11-07 08:40:59 +05:30
dfireBird
19c0c60064 feat: detect default stash message
use commit message as default stash message if commit message box is populated
2020-11-07 08:39:26 +05:30
João Moreno
ce4fb6e323 fixes #96264 2020-11-06 14:45:26 +01:00
João Moreno
63ce8b4732 fixes #92146 2020-11-06 12:00:13 +01:00
João Moreno
49990bebe4 add git CommandErrorOutputTextDocumentContentProvider 2020-11-05 16:46:42 +01:00
João Moreno
ec471da613 Merge branch 'master' into pr/95354 2020-11-05 16:22:48 +01:00
João Moreno
cd6466909b fixes #92034 2020-11-05 16:03:12 +01:00
João Moreno
e3ace1fe1f Merge branch 'master' into pr/94369 2020-11-05 15:56:26 +01:00
João Moreno
7b6561ff5b Merge remote-tracking branch 'origin/master' 2020-11-05 15:33:22 +01:00
João Moreno
08d271585d 💄 2020-11-05 15:33:07 +01:00
João Moreno
eb1cea5432 Merge branch 'master' into pr/94358 2020-11-05 15:28:07 +01:00
Dor Mesica
544c986e0a Added a warning before dropping a stash. (#94267)
* Added a message before dropping a stash.

* Update extensions/git/src/commands.ts

Co-authored-by: João Moreno <mail@joaomoreno.com>
2020-11-05 15:20:37 +01:00
João Moreno
5afaec5c21 Merge remote-tracking branch 'origin/master' 2020-11-05 15:18:06 +01:00
João Moreno
7328c3ccb0 Merge branch 'master' into pr/91838 2020-11-05 15:13:59 +01:00
Jean Pierre
818d57db15 Better diff for deleted file in merge conflict. Fixes #88973 (#91245)
Co-authored-by: João Moreno <joao.moreno@microsoft.com>
2020-11-05 15:11:00 +01:00
João Moreno
578d7381da fix #7989 2020-11-05 11:43:42 +01:00