Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-03-03 23:39:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
100,456 Commits 3,118 Branches 347 Tags
eff6fa7696ded98ff145744554d94de44365f209
Commit Graph

1988 Commits

Author SHA1 Message Date
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
João Moreno
1b9cd42b9b remove unused import 2020-11-04 15:47:49 +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
Fons van der Plas
b6a02bb4e2 message "Would you like to stage all chages?" (#109272) 
The old message,
```
Would you like to automatically stage all your changes and commit them directly?
```
sounds like clicking _Yes_ will do this _automatically_ from now on, which is not the case. I removed _automatically_.
 2020-10-28 11:05:07 +01:00
João Moreno
f50ee04ed9 fix git submenus order 
fixes #109286
 2020-10-26 15:06:53 +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
Eric Amodio
16f4a29aa0 Changes URI -> Uri 2020-10-25 22:50:25 -04:00
João Moreno
c781e1f4ff 💄 2020-10-23 14:45:41 +02:00
João Moreno
42e920a18a Merge branch 'master' into pr/108913 2020-10-23 14:32:22 +02:00
tomerstav
039f26db56 Highlight branchs upstream if defined by placing item first in picker 2020-10-23 04:36:17 +00: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
João Moreno
990c0284db Merge branch 'master' into pr/109133 2020-10-22 21:03:56 +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
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
b9115b8b9c fixes #108714 2020-10-16 16:58:25 +02:00
Andrey Sinitsyn
b71ede64c1 fix(git): fatal when adding, reverting files or cleaning repo on win32 (#108691) 
Fixes issue #108690
 2020-10-16 15:26:15 +02:00
Eric Amodio
0ac9d25b81 Closes #91695 - adds emoji support 2020-10-12 14:38:07 -04:00
Eric Amodio
9910c38005 Fixes #108530 2020-10-12 11:08:13 -04:00
João Moreno
47116a8acd fixes #108371 2020-10-12 11:04:30 +02:00
Sebastian Andil
6f4409deae Fix typo (#108329) 2020-10-09 16:28:58 +02:00
João Moreno
7cb2f56439 more uppercase 
fixes #108348
 2020-10-09 16:24:11 +02:00
Eric Amodio
d8b1776ccb Closes #97407, #93405 2020-10-09 02:31:48 -04:00
Eric Amodio
937b30edf2 Fixes #100610 2020-10-07 16:00:07 -04:00
Hung-Wei Hung
02cfa0b9a8 Create empty commit with changed files #107753 2020-10-02 16:37:01 +08: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
Martin Aeschlimann
2ef6c258b0 Merge pull request #107215 from microsoft/aeschli/welcomeViewGroups 
groups for viewsWelcome
 2020-09-28 14:10:06 -07: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
0a914e0e61 remove priority all togther, maybe add something like severity in the future, https://github.com/microsoft/vscode/issues/54938 2020-09-25 16:13:26 +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
Martin Aeschlimann
99c8d615c1 groups for viewsWelcome 2020-09-22 12:04:53 +02:00
ChaseKnowlden
e8760a5d6c Fix capitalization of GitHub org 2020-09-17 11:43:03 +02:00
Matt Bierner
50cc1d0e97 Update to use TS 4.1 for building VS Code 2020-09-16 11:58:01 -07:00
MoQ93
17cdb69891 Allow empty tag message in git (#106751) 2020-09-16 10:22:19 +02:00
Jason Wang
3cc907a220 Fix return 2020-09-10 14:02:42 -07:00