Commit Graph

1478 Commits

Author SHA1 Message Date
João Moreno
ffda3a18cc fixes #100183 2020-07-01 10:51:55 +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
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
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
8efd882655 Merge branch 'master' into joao/scm-view 2020-06-25 10:35:16 +02:00
isidor
4e6150b4e0 change unstage selected ranges to cmd+k cmd+n
fixes #99011
2020-06-25 09:19:18 +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
João Moreno
fad4d8d254 fixes #100524 2020-06-21 22:58:32 +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
João Moreno
159bc687ca fix regex 2020-06-11 17:29:12 +02:00
João Moreno
3cc8685501 fixes #24883 2020-06-11 11:36:57 +02:00
Utsav Munendra
19dcc7916c Fixes https://github.com/microsoft/vscode/issues/79910 (#80150)
Co-authored-by: João Moreno <joao.moreno@microsoft.com>
2020-06-10 17:41:48 +02:00
João Moreno
24f1b69a90 git file system should wait for model to be initialized 2020-06-10 15:44:53 +02:00
Alex Ross
92164dd93d Add a pattern to the git BranchQuery (#99681)
* Add a pattern to the git BranchQuery

* Add count, which makes getting refs even faster

* Update order of args in getRefs to match for-each-ref doc
2020-06-10 13:51:00 +02:00
João Moreno
43f362b448 fixes #96356 2020-06-03 15:19:05 +02:00
João Moreno
e0046cbd1d 💄 2020-05-27 15:35:08 +02:00
João Moreno
844960ea1e Merge branch 'master' into pr/97349 2020-05-27 15:30:08 +02:00
João Moreno
8cce062aaf 💄 2020-05-27 15:27:13 +02:00
Pascal Fong Kye
65fa899fbe refactor: stage all but merge 2020-05-24 21:58:25 +02:00
Pascal Fong Kye
d2b5d323d0 feat:new command stage all merge 2020-05-24 21:58:24 +02:00
rzj17
60d906fd57 Modify git add/revert to use splitInChunks 2020-05-23 18:13:55 +01:00
João Moreno
025dc8a948 add remote from push 2020-05-20 11:37:53 +02:00
João Moreno
0700c9ea43 git: contributable add remote 2020-05-20 11:37:53 +02:00
Johannes Rieken
1ea6771919 fix https://github.com/microsoft/vscode/issues/97836 2020-05-20 10:19:54 +02:00
João Moreno
a85a2e6044 move credential provider to github 2020-05-18 21:04:29 +02:00
João Moreno
b629dba454 export to, clone from github 2020-05-18 15:51:15 +02:00
João Moreno
4c36782f8e git api: publishRepository 2020-05-15 10:50:05 +02:00
João Moreno
6981f7c7fb 💄 2020-05-15 10:50:05 +02:00
João Moreno
6d127275f2 💄 2020-05-15 10:50:05 +02:00
Alex Ross
6570efce0f Add git extension API for branches (#97621)
Enables microsoft/vscode-pull-request-github#1781
2020-05-14 12:26:50 +02:00
Alex Ross
3da22e920b Add path to LogOptions (#97693)
Part of microsoft/vscode-pull-request-github#1781
2020-05-13 16:04:28 +02:00
João Moreno
ea89f2d8b9 related to microsoft/vscode-pull-request-github#1759 2020-05-13 11:24:51 +02:00
João Moreno
5185d7e6f8 disable askpass, terminal and github auth when git is disabled
fixes #97320
2020-05-12 13:37:00 +02:00
Ladislau Szomoru
ee8a6bc4f8 Git: Add "git rebase --abort" command (#97071)
Add "git rebase --abort" command
2020-05-07 14:26:55 +02:00
João Moreno
0209826b56 fixes #96399 2020-04-28 15:09:38 +02:00
João Moreno
75877c8185 Merge pull request #96080 from johnbillion/fix/gitignore_global
Treat `.gitignore_global` as an Ignore file by default.
2020-04-27 15:58:23 +02:00