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

1771 Commits

Author SHA1 Message Date
Joao Moreno
4c62dfa0a4 git commit with input bail early 2017-05-04 16:45:49 +02:00
Joao Moreno
b31c1e1fc9 use global settings 2017-05-04 16:42:02 +02:00
Joao Moreno
0dcb957f4c Merge branch 'Issue15613_AllFilesCommitted' of https://github.com/seesemichaelj/vscode into seesemichaelj-Issue15613_AllFilesCommitted 2017-05-04 16:32:37 +02:00
Joao Moreno
af6f8aa748 clean up #24950 2017-05-04 16:04:30 +02:00
Joao Moreno
b94f56f7cc Merge branch 'git-default-branch-directory' of https://github.com/ihalip/vscode into ihalip-git-default-branch-directory 2017-05-04 16:00:45 +02:00
Rokas Gečas
818fa5a50f #10542 Ability to merge local git branches 2017-05-01 16:44:00 +03:00
Joao Moreno
9b7a8813e0 🐛 SourceControlResourceDecorations.faded 
fixes #24097
 2017-04-27 15:38:27 +02:00
Joao Moreno
f0fe019745 🐛 remove git init icon 
fixes #21103
 2017-04-27 11:25:45 +02:00
Joao Moreno
40f2a2f35b 🐛 make git.cleanAll more alarming 
fixes #24803
 2017-04-27 09:29:40 +02:00
Joao Moreno
4e636bf50f 🐛 fixes #24052 2017-04-26 17:55:44 +02:00
Joao Moreno
bf02ba2f7d 🐛 fixes #25225 2017-04-26 17:14:35 +02:00
Joao Moreno
fad430efb9 🐛 fixes #25252 2017-04-26 17:14:35 +02:00
Joao Moreno
9234a7c97c 🐛 dont call iconv with unsupported encodings 
fixes #25359
 2017-04-26 16:58:12 +02:00
Joao Moreno
facdcded9d 🐛 git status errors are incomplete 
fixes #25408
fixes #25302
 2017-04-26 16:54:45 +02:00
Joao Moreno
c973c34597 🐛 fix git throttle decorator 
fixes #25271
 2017-04-26 16:44:54 +02:00
Mike Seese
e64cf31217 Prevent redundant enableSmartCommit prompt 
This prevents a prompt for enableSmartCommit if there are no changes at all
 2017-04-25 23:23:30 -04:00
Mike Seese
dc8f4d6fa4 Check git enableSmartCommit if no staged files 2017-04-25 23:13:51 -04:00
Mike Seese
5d323a3eca Add git enableSmartCommit setting 
If false, this setting will prompt the user if they want to commit all files if none are staged
 2017-04-25 23:13:07 -04:00
Joao Moreno
24dcf7a27d 🐛 git always show stderr 
fixes #23632
 2017-04-25 17:37:27 +02:00
Joao Moreno
e2e8ee077d 🐛 better git push error message 
fixes #23553
 2017-04-25 17:33:23 +02:00
Joao Moreno
485faa0998 🐛 fixes #21143 2017-04-25 17:03:55 +02:00
Joao Moreno
c89361a0e0 🐛 fix git command labels 2017-04-25 15:44:37 +02:00
Johannes Rieken
2d64239944 rename ProgressLocation.Scm to ProgressLocation.SourceControl, #18066 2017-04-25 12:38:42 +02:00
Johannes Rieken
c5d2d86a70 adopt git to final progress API, #18066 2017-04-25 12:38:41 +02:00
Joao Moreno
397937c787 🐛 range (un)staging should be line based 
fixes #21513
 2017-04-25 11:53:00 +02:00
Matt Bierner
dc0f3ecdb2 Fix VSCode/Extensions for TS 2.3.1 (#25248) 
From: https://github.com/Microsoft/TypeScript/issues/15352

TS 2.3.1 introduced a breaking change around checking of generic types. This change tries to fix these compiler errors in the extensions codebase
 2017-04-24 16:05:57 -07:00
Joao Moreno
f44b474ebf ✨ fixes #24031 2017-04-24 12:22:00 +02:00
Joao Moreno
a199b2aa53 ✨ merge git.open* commands 2017-04-24 11:47:09 +02:00
Joao Moreno
566fdd4879 🎨 cleanup git show code 2017-04-24 10:51:08 +02:00
Joao Moreno
3598679114 don't decode stderr 2017-04-24 10:37:15 +02:00
Joao Moreno
7cf0ad0440 Merge branch 'git-encoding' of https://github.com/igelbox/vscode into igelbox-git-encoding 2017-04-24 10:25:45 +02:00
Joao Moreno
f3d5a6c000 🐛 fixes #25153 2017-04-24 09:02:28 +02:00
Joao Moreno
9208c4b4fe 🐛 fixes #24646 2017-04-21 15:24:49 +02:00
Joao Moreno
83d86b36f2 🐛 fixes #21285 2017-04-21 14:56:05 +02:00
Joao Moreno
6097966099 🐛 spinning sync icon 
fixes #23975
 2017-04-21 12:40:10 +02:00
Joao Moreno
b1d403f866 🐛 fixes #24598 2017-04-21 09:21:39 +02:00
Ilie Halip
db4208013f Merge remote-tracking branch 'upstream/master' into git-default-branch-directory 2017-04-19 18:49:50 +03:00
Joao Moreno
0be6167d9e Merge branch 'git-perf' 2017-04-19 08:49:07 +02:00
Joao Moreno
cda46bce46 🐛 catch git fetch errors 2017-04-19 08:47:38 +02:00
Joao Moreno
fb094b4322 ✨ git: huge repo prevention 2017-04-19 08:44:16 +02:00
Ramya Achutha Rao
84af63a933 Increment version of vscode extension telemetry module 2017-04-18 14:46:35 -07:00
Joao Moreno
a0daeaaf1c 🐛 fix git test compilation 2017-04-18 17:19:04 +02:00
Joao Moreno
6146b9739a ⚡ git: run status without buffering whole output 2017-04-18 17:16:20 +02:00
Joao Moreno
d2c40f06b3 🐛 catch git fetch errors 2017-04-18 14:49:09 +02:00
Ilie Halip
f19aa21df8 added config option git.cloneDirectory, defaulting to os.homedir() 2017-04-18 15:26:28 +03: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
Alex Dima
aca01f2daa Fix build hygiene issues 2017-04-14 14:08:52 +03:00
Matt Bierner
0d14027696 Fix a few compile issues when using TS 2.3 (#24731) 
Tested recomppiling VSCode with TS2.3. This fixes a few issues that were discovered, including workarounds for:

* https://github.com/Microsoft/TypeScript/issues/15184
* https://github.com/Microsoft/TypeScript/issues/15185
 2017-04-13 17:14:50 -07:00
Joao Moreno
85b04dc330 🎨 git.ignoreLegacyWarning 2017-04-13 10:04:48 +02:00
NKumar2
615ebe524b Adding 'never show again' in Git Extension 2017-04-13 12:10:19 +05:30