Commit Graph

610 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
6aafc4b7aa fixes #104762 2020-08-31 15:21:15 +02:00
Benjamin Pasero
1689304b52 Allow to configure workbench.editor.restoreViewState per language (fix #101110) 2020-08-24 07:58:05 +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
532c7b1c78 cleaner git submenus 2020-08-03 14:11:14 +02:00
João Moreno
22ff86bac3 fixes #102109 2020-07-31 15:38:16 +02:00
NotWearingPants
399d695f5f Treat all files with a gitignore extension as ignore files 2020-07-22 00:18:54 +03:00
Martin Aeschlimann
4c99db1a05 file extensins: put primary first. For #102100 2020-07-11 17:36:19 +02:00
Benjamin Pasero
0e96426609 🆙 iconv-lite-umd@0.6.8 (fix #101905) 2020-07-08 17:29:59 +02:00
Benjamin Pasero
d95b65443d Encoding euckr does not exist anymore (fix #101847) 2020-07-07 14:03:23 +02:00
Benjamin Pasero
1fb0d4424d 🆙 jschardet@2.2.1 (#33720) (#101489) 2020-07-03 15:53:02 +02:00
Fedor Nezhivoi
574779eb61 update iconv-lite-umd to 0.6.5 for #79275 (#101262) 2020-06-29 08:12:42 +02:00
Fedor Nezhivoi
b03f792383 update iconv-lite-umd to 0.6.4 for #79275 (#101213) 2020-06-28 10:05:39 +02:00
isidor
4e6150b4e0 change unstage selected ranges to cmd+k cmd+n
fixes #99011
2020-06-25 09:19:18 +02:00
Fedor Nezhivoi
24e0a82229 Move encoding to common for #79275 (#100539)
* move encoding.ts to common for #79275

* load iconv-lite-umd and jschardet in web version for #79275

* move EncodingOracle to the AbstractTextFileService for #79275

* review

* update to new iconv-lite-umd

* add workaround for jschardet types

* fix indentation

* add iconv-lite-umd and jschardet to workbench.html

* fix paths for modules

Co-authored-by: Benjamin Pasero <benjpas@microsoft.com>
2020-06-20 10:47:29 +02:00
Fedor Nezhivoi
314b58c8e1 switch to use iconv-lite-umd for #79275 (#100472)
Co-authored-by: Benjamin Pasero <benjpas@microsoft.com>
2020-06-18 16:08:17 +02:00
Benjamin Pasero
3675f28129 Revert "Revert "decouple vs/base/node/encoding.ts from node streams for #79275 (#99413)""
This reverts commit 495112ded5.
2020-06-17 10:45:58 +02:00
João Moreno
208d556b1d fixes #100015 2020-06-17 09:41:55 +02:00
Benjamin Pasero
495112ded5 Revert "decouple vs/base/node/encoding.ts from node streams for #79275 (#99413)"
This reverts commit 1dbfecd37f.
2020-06-17 09:09:59 +02:00
Fedor Nezhivoi
1dbfecd37f decouple vs/base/node/encoding.ts from node streams for #79275 (#99413) 2020-06-17 09:09:12 +02:00