Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-25 04:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,891 Commits 2,500 Branches 340 Tags
e27de3300a99ea2fc65235b38778253a4de286ce
Commit Graph

284 Commits

Author SHA1 Message Date
Joao Moreno
a807a515bb fixes #26642 2017-06-14 16:32:00 +02:00
Joao Moreno
09e22b8542 fixes #27367 2017-06-14 15:16:34 +02:00
Benjamin Pasero
eac49a321b Git: rename 'Publish' to 'Publish Branch' (fixes #26133) 2017-06-01 09:26:37 +02:00
Christof Marti
89fa243fc9 Hid Git actions from merge conflict (fixes #27563) 2017-05-31 10:28:15 -07:00
Joao Moreno
a0a1b9e0d6 fixes #26184 2017-05-26 09:27:28 +02:00
Maik Riechert
3df1eca296 localize 2017-05-26 09:27:25 +02:00
Maik Riechert
b348a0b780 handle git branch delete error ("not fully merged") 2017-05-26 09:27:25 +02:00
Maik Riechert
b96478ebcc add git delete branch command 2017-05-26 09:27:24 +02:00
Phil Price
191fc7c9d9 Remove git merge conflict decorator 2017-05-22 18:40:14 -07:00
Anthony Sottile
0b7f4425ef Correct LC_ALL. Resolves #26227 2017-05-10 13:37:52 -07:00
Joao Moreno
e707642a3c git: don't use fs.watch 
fixes #25175
 2017-05-10 11:03:18 +02:00
Matt Bierner
7d2dea4e45 Add "Include" to extension TSConfig Files (#25860) 
**Bug**
Most VSCode extensions currently specify `"exclude"` in their `tsconfig.json` but not `"include"`. This may result in extra files being included in each project

**Fix**
Add  `"include": ["src/**/*"]` to all extension tsconfig files
 2017-05-05 11:37:59 -07:00
João Moreno
6067977ea9 Merge pull request #26008 from letmaik/git-sync-ahead-behind 
Show ahead/behind indicator while git syncing
 2017-05-05 12:56:12 +02:00
Maik Riechert
1a4f9ab0e6 show ahead/behind while git syncing 
reverts fab6f8871a
 2017-05-05 10:15:08 +01:00
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
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