Commit Graph

1771 Commits

Author SHA1 Message Date
João Moreno
479b3dafb5 Merge branch 'joao/git-remote-providers' 2020-04-20 17:33:16 +02:00
João Moreno
0da6ba9071 Merge pull request #95549 from avdg/git-pager
Do not let git use a pager
2020-04-20 15:56:12 +02:00
Anthony Van de Gejuchte
bf9146eaf0 User 'cat' as GIT_PAGER option 2020-04-20 15:11:05 +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
Anthony Van de Gejuchte
057500153b Move env declaration of GIT_PAGER 2020-04-20 14:13:34 +02:00
Anthony Van de Gejuchte
7374bff932 Do not let git use a pager 2020-04-17 18:37:51 +02:00
João Moreno
675ed02c1f move RemoteSourceProvider to git api 2020-04-17 16:34:22 +02:00
João Moreno
aeeec54c8e missing 2020-04-17 15:58:15 +02:00
João Moreno
1494dc7d08 improve ux around git remote picker 2020-04-17 15:56:13 +02:00
João Moreno
5f79de53e6 Merge branch 'master' into joao/git-remote-providers 2020-04-17 15:47:46 +02:00
Eric Amodio
77e79529e1 Removes bogus code 2020-04-16 11:48:34 -04:00
João Moreno
27afc6b477 wip: git remote providers 2020-04-15 21:30:32 +02:00
Nathaniel Palmer
4420bbfbcf Offer to show git command output on failure 2020-04-15 12:48:04 -04:00
João Moreno
b8512b2055 remove git content provider 2020-04-15 07:42:50 +02:00
bkis
433380c3c1 Fix typo in git extension's config description (#94993) 2020-04-11 06:45:15 -07:00
Eric Amodio
9640830490 Fixes #94882 -- checks for trailing \ & protects
if somehow `networkPath` had a trailing \, it would cause this behavior
2020-04-10 15:14:14 -04:00
Isidor Nikolic
71913027c3 Merge pull request #93706 from ChrisPapp/git_keybindings
Add default keybindings for stage/revert/unstage selected ranges
2020-04-09 17:13:27 +02:00
João Moreno
8ceb90a807 fixes #93493 2020-04-09 15:22:27 +02:00
João Moreno
85f3f46ec1 fixes #93779 2020-04-09 11:13:36 +02:00
João Moreno
6e89889166 Merge pull request #91872 from jeanp413/fix-91871
Fixes missing git folder actions under Untracked Changes group in scm viewlet
2020-04-07 17:27:01 +02:00
Eric Amodio
4ccf3e4ef3 Fixes #94163 2020-04-06 23:58:04 -04:00
Eric Amodio
4f179b7241 Adds better menu grouping 2020-04-06 23:21:40 -04:00
Jean Pierre
e0850567f5 Merge branch 'master' into fix-91871 2020-04-05 20:26:43 -05:00
Jakub
5a9b210d91 Merge branch 'master' of https://github.com/microsoft/vscode 2020-04-04 14:29:58 +02:00
Eric Amodio
28dbe0755e Fixes #94090 - adds remote scheme for git timeline 2020-04-03 17:28:09 -04:00
Eric Amodio
2c684a77a6 Fixes #94107 remove open changes action 2020-04-03 17:28:09 -04:00
Jacob
156d5ab281 Added setting for opening cloned repository without prompt. #93300 2020-04-03 13:43:50 +02:00
Dmitry Sharshakov
412a44e9bc Git: ask to save unsaved files before stashing 2020-04-03 12:51:59 +03:00
Jacob
bc85a9ffdb Added user choice for opening the folder always. 2020-04-02 17:34:07 +02:00
Christos Pappas
482acb89e9 Add mac specific keys
Use command key instead of ctrl on Mac
2020-04-01 20:16:21 +03:00
’Christos
602f3f9b46 Add default keybindings for stage/revert/unstage selected ranges
git.stageSelectedRanges   -> ctrl + k, ctrl + alt + s
git.unstageSelectedRanges -> ctrl + k, ctrl + u
git.revertSelectedRanges  -> ctrl + k, ctrl + r

Closes #93564
2020-03-30 02:49:03 +03:00
Eric Amodio
e62c4302b0 Removes day.js dependency; uses Intl instead 2020-03-26 00:10:41 -04:00
Eric Amodio
a096bae36c Switches to use realpath.native instead of wmic 2020-03-25 16:34:52 -04:00
Eric Amodio
68e7b61f91 Fixes #91548 - git 2.25+ network drive issue
On Git 2.25+ if you call rev-parse --show-toplevel on a mapped drive, instead of getting the mapped drive path back, you get the UNC path for the mapped drive.

So we will try to normalize it back to the mapped drive path if possible
2020-03-25 03:31:55 -04:00
Eric Amodio
9c1e26890c Fixes #91377 - save previous ref 2020-03-23 17:15:41 -04:00
Eric Amodio
a5987ce853 Fixes focus issue on click 2020-03-23 17:15:18 -04:00
Eric Amodio
5391a481bc Simplifies timeline paging options 2020-03-23 13:49:44 -04:00
Eric Amodio
3f6843956a Refactors timeline to work better w/ multi sources
Separates the tree rendering from the data model cache
Fixes many issues and simplifies the code
2020-03-20 04:00:52 -04:00
Mathias Rasmussen
725985401d Merge branch 'master' into amend-message 2020-03-11 01:32:16 +01:00
Miguel Solorio
6b745dace7 Use codicons in scm 2020-03-05 11:24:32 -08:00
Eric Amodio
d1c1e27028 Changes limit to take a cursor object — #91722 2020-03-02 04:35:43 -05:00
jeanp413
b0a50321f7 Fixes #91871 2020-03-01 22:16:17 -05:00
Eric Amodio
a5225d02a8 Limits schemes for Git timeline provider 2020-03-01 11:32:59 -05:00
Eric Amodio
634522a6ed Fixes #91381 2020-03-01 11:32:18 -05:00
Mathias Rasmussen
f23fcb72f5 allow git amend message only 2020-03-01 05:14:00 +01:00
Eric Amodio
d983fe6014 Fixes bad encoding in title - ref #91377 2020-02-27 11:23:45 -05:00
Joao Moreno
96dfec43ee fixes #90934 2020-02-27 09:58:06 +01:00
Joao Moreno
04c9b01aff fixes #91466 2020-02-27 09:24:38 +01:00
Joao Moreno
50ec1b1b33 fixes #91070 2020-02-27 08:37:34 +01:00
Eric Amodio
89cafb24e5 Localizes timeline strings 2020-02-24 22:56:45 -05:00