Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-22 17:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
90,679 Commits 3,644 Branches 358 Tags
3abcabd4e8a4929ae9f15cf05ae4e8a7dbaaec11
Commit Graph

1771 Commits

Author SHA1 Message Date
Phil Marshall
957f809e4d update strings for prompt to save staged files 2019-01-25 21:16:53 -06:00
Phil Marshall
3cfd860344 git prompts to save only staged files 2019-01-25 21:16:00 -06:00
João Moreno
65fcf3180b Merge pull request #66416 from Microsoft/rebornix/git-blame 
add git blame api
 2019-01-16 09:17:44 +01:00
rebornix
f27183be67 add error code for git blame 2019-01-15 11:56:48 -08:00
Haritha Wickremasinghe
23058bece6 When resolving a merge conflict allow accepting the default commit message 
Fixes #6403
 2019-01-14 13:22:03 -05:00
rebornix
e5a596be29 add git blame api 2019-01-11 13:10:54 -08:00
SteVen Batten
ccdd2997a6 update AI module (#66370) 
fixes #64849
 2019-01-10 17:43:25 -08:00
Ilya Biryukov
04c3dde6e4 Address PR feedback on Git provide APIs 2019-01-07 11:38:33 -08:00
Joao Moreno
ff157f90a0 add unshallow as an option for git pull 2019-01-07 11:22:26 +01:00
Joao Moreno
bba335ab63 Merge commit 'refs/pull/65786/head' of github.com:Microsoft/vscode into pr/65786 2019-01-07 11:15:18 +01:00
Joao Moreno
c4a1b80e48 fix git settings scope 2019-01-07 09:58:34 +01:00
Rich Evans
f1e2a0a2b5 Try naiive rev-parse for branches beginning with @ to see if they resolve, before replacing with symbolic full name version. 2019-01-05 16:05:13 -08:00
Rich Evans
fc488dd86c Chunk clean, checkout and update submodule commands within repository.ts to ensure the length of the files passed to the repository are less than 30k characters to avoid ENAMETOOLONG failures on Windows when working with very large changesets 2019-01-05 13:09:43 -08:00
Joao Moreno
2f82209adf 💄 cleanup git input validation rules 
#60407
 2019-01-04 17:03:11 +01:00
Joao Moreno
e6878ce54f Merge commit 'refs/pull/60407/head' of github.com:Microsoft/vscode into pr/60407 2019-01-04 16:51:22 +01:00
Joao Moreno
a8aa85192a Merge branch 'master', commit 'refs/pull/60387/head' of github.com:Microsoft/vscode into pr/60387 2019-01-04 16:40:21 +01:00
Joao Moreno
3d928bbb27 💄 auto fetch period 2019-01-04 16:38:12 +01:00
Joao Moreno
32d22dbace Merge commit 'refs/pull/59988/head' of github.com:Microsoft/vscode into pr/59988 2019-01-04 16:30:25 +01:00
Joao Moreno
507a3508a5 💄 2019-01-04 16:24:14 +01:00
Joao Moreno
579b962ae1 Merge commit 'refs/pull/59974/head' of github.com:Microsoft/vscode into pr/59974 2019-01-04 16:22:03 +01:00
Joao Moreno
dcb3c339c8 preserve user input when creating branch from checkout 
fixes #60895
 2019-01-04 16:08:12 +01:00
Joao Moreno
133e999097 💄 2019-01-04 15:16:45 +01:00
Joao Moreno
cf107f3c3d Merge commit 'refs/pull/59078/head' of github.com:Microsoft/vscode into pr/59078 2019-01-04 15:02:46 +01:00
Joao Moreno
3a2c97c5d6 refactor autostash behaviour 2019-01-04 14:58:44 +01:00
Joao Moreno
5c8c42e886 remove unnecessary operation run 2019-01-04 14:41:45 +01:00
Joao Moreno
9b88d30734 Merge commit 'refs/pull/59849/head' of github.com:Microsoft/vscode into pr/59849 2019-01-04 14:34:28 +01:00
Rob Lourens
ef2547d547 replace void 0 with undefined 2019-01-03 11:20:19 -08:00
Joao Moreno
fe6e62674c remove 100 change limit 2019-01-03 09:20:20 +01:00
Dan Wood
6208e8441e Clean user input for git clone extension 
Strip whitespace and "git clone " from start of string. This will allow
VSCode to intelligently handle copy and paste from command line
instructions being pasted into the clone input box.
 2019-01-03 00:10:44 +11:00
Peng Lyu
94a04621dd Fix microsoft/vscode-pull-request-github#612. Allow fetching with limited depths 2018-12-28 12:02:28 -08:00
Joao Moreno
6de43eec8d Merge commit 'refs/pull/59163/head' of github.com:Microsoft/vscode into pr/59163 2018-12-20 12:51:58 +01:00
Joao Moreno
6d31c16989 💄 2018-12-20 12:37:04 +01:00
Joao Moreno
cdb8a86fd0 git ignore: save after apply edit 2018-12-20 11:33:01 +01:00
Joao Moreno
349b0d454e fix git.openDiffOnClick scope 2018-12-20 10:17:26 +01:00
João Moreno
034ff33eb4 Merge pull request #64305 from Microsoft/misolori/open-change-icons 
Update "Open changes" icons to better reflect diff changes
 2018-12-19 08:43:09 +01:00
Tito
7a69cd07c0 Git sync now publishes branch upon confirmation (#64183 issue fix) 2018-12-18 02:27:38 +00:00
joaorreis
6dbf6b5857 fixed 2018-12-17 14:47:35 +00:00
Ilya Biryukov
01292b4174 Add Git log, globalConfig, and tree diff API 2018-12-11 14:04:34 -08:00
Darrien Singleton
378cd7abd9 Merge branch 'master' into gitcloneissue 2018-12-07 14:16:14 -05:00
Rachel Macfarlane
e27511826f Add GitErrorCode to apply command 2018-12-07 10:21:03 -08:00
Joao Moreno
351905fd53 fixes #63957 2018-12-06 09:43:32 +01:00
Miguel Solorio
7b0677f9dc Update "open change" icons to better reflect the "diff" changes. Uses octicons. 2018-12-04 10:45:27 +01:00
m.zaretski
fe6864f649 'suggestSmartCommit' configuration setting was introduced 2018-11-25 17:32:09 +03:00
Luo Wenqing
a84421bbb3 Merge branch 'master' into fix-branch-checkout 2018-11-25 21:09:46 +08:00
Isidor Nikolic
ec98c79d44 Merge pull request #63497 from Microsoft/isidorn/cgmanifest 
Start using component governance for oss tracking
 2018-11-20 12:54:47 +01:00
isidor
9edd984da8 delete OSSREADME.json 2018-11-20 12:54:22 +01:00
João Moreno
66f717cfa6 Merge pull request #60104 from mathiasvr/fix-60002 
Fix #60002 Undo last commit: keep staged files
 2018-11-20 09:59:42 +01:00
Joao Moreno
3af878c2d5 💄 2018-11-20 09:58:01 +01:00
Joao Moreno
6052fcf07f Merge commit 'refs/pull/59735/head' of github.com:Microsoft/vscode into pr/59735 2018-11-20 09:43:16 +01:00
Joao Moreno
e5406b523e introduce git.openDiffOnClick 
fixes #63005
 2018-11-19 11:54:51 +01:00