Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-21 00:59:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,908 Commits 3,617 Branches 357 Tags
b10df87f56901b6c12bde0f4c579dd5aabc9d50f
Commit Graph

5 Commits

Author SHA1 Message Date
Joao Moreno
bcb3e0d00e detect conflict markers when staging 
fixes #33983
 2017-10-03 10:21:20 +02:00
kieferrm
3f8bd163f4 update dependency on vscode-extension-telemetry 2017-06-30 09:57:37 -07:00
Joao Moreno
5667cc0e69 use vsce to determine what to package when bundling extensions 
fixes #29054
 2017-06-21 16:17:21 +02:00
Vakhurin Sergey
74349805ab Added support for encodings for Git. 
Fixes #21146

**Bug**
Git always uses utf8 encoding for retrieving file contents.

**Fix**
Pass the 'files.encoding' configuration property to the git-extension and use this encoding to decode git output.
 2017-04-17 23:00:08 +03:00
rebornix
b2a55bd66e update shrinkwrap for git extension 2017-02-24 10:57:09 -08:00