Commit Graph

718 Commits

Author SHA1 Message Date
Joao Moreno f6ee190cf7 fixes #36885 2017-12-15 15:39:01 +01:00
Joao Moreno 9622ada626 find git in LocalAppData and PATH, win32
fixes #40229
2017-12-15 10:38:02 +01:00
Joao Moreno 3017bc0f9c git submodule decorations 2017-12-14 12:03:54 +01:00
Joao Moreno 7ae85acb65 Merge branch 'newAutoRepositoryDetection' of https://github.com/BattleBas/vscode into BattleBas-newAutoRepositoryDetection 2017-12-11 17:42:25 +01:00
Joao Moreno 6e5e8abb16 fixes #35031 2017-12-04 15:16:07 +01:00
Joao Moreno 9544e5faa0 git.enabled as a resource setting
fixes #37492
2017-11-27 16:08:15 +01:00
Joao Moreno e69ca9ff85 cleanup git commands enablement 2017-11-27 16:08:15 +01:00
Joao Moreno 629ad31204 fix git commands 2017-11-27 16:08:15 +01:00
Joao Moreno 548bfe91af disable auto fetch
fixes #34684
2017-11-24 11:12:45 +01:00
Joao Moreno 000325a03b alert when git is missing
fixes #38393
2017-11-17 11:35:49 +01:00
Joao Moreno 12c41aa9bd Merge branch '34527' of https://github.com/raouldc/vscode into raouldc-34527 2017-11-10 17:03:06 +01:00
Joao Moreno 57b2a86868 Merge branch 'justinhhorner-git-rename-branch' of https://github.com/justinhhorner/vscode into justinhhorner-justinhhorner-git-rename-branch 2017-11-10 16:51:44 +01:00
Joao Moreno 2f3b485b92 compile stuff 2017-11-09 18:32:05 +01:00
Joao Moreno d1b9a70d17 git: data uris 2017-11-09 17:54:00 +01:00
Joao Moreno 948c568872 💄 2017-11-08 12:24:24 +01:00
Joao Moreno 07885099aa Merge branch '31055-Sync-Rebase' of https://github.com/excerebrose/vscode into excerebrose-31055-Sync-Rebase 2017-11-08 12:20:10 +01:00
Matt Bierner b743e245ad Enable strict compilation settings in git extension
Enables strict checks in the git extensions
2017-11-06 13:33:22 -08:00
Benjamin Pasero 1b36db4a99 ⬆️ iconv-lite@0.4.19 2017-11-06 10:51:52 +01:00
Joao Moreno 16692ae72c fixes #37226 2017-11-01 16:08:08 +01:00
Johannes Rieken fe3f6cc861 fix #37331 2017-11-01 15:41:06 +01:00
Johannes Rieken 5efffdfcb4 add git.decorations.enabled setting, #37299 2017-11-01 14:44:50 +01:00
Johannes Rieken 1cafd15b44 fix #37403 2017-11-01 14:18:24 +01:00
Johannes Rieken f502f70345 deco - align git color names 2017-10-30 16:44:51 +01:00
isidor 3e3d09021d also use darker red for git deleted 2017-10-25 17:24:24 +02:00
isidor 5d93cd1543 git color decoration: a bit different colors for light theme 2017-10-25 17:20:44 +02:00
Johannes Rieken a0c26c8a1d deco - show badge in scm viewlet when no icons are provided 2017-10-24 17:58:04 +02:00
Johannes Rieken 5faa72ac39 deco - use a color for ignored files 2017-10-18 09:03:15 +02:00
BattleBas 6c40a968f4 Added setting "git.autoRepositoryDetection"
When opening just one file, the setting "autoRepositoryDetection" allows the user to control whether the entire repository changes will be displayed or just the changes of the current file.
2017-10-12 20:19:07 -05:00
Joao Moreno 3070c0bb66 Merge branch 'dirtydiff' 2017-10-12 16:07:31 +02:00
Johannes Rieken f813a949c1 adjust scm colors 2017-10-12 14:47:02 +02:00
Joao Moreno 7d729c9d17 diff: inline actions 2017-10-11 15:16:47 +02:00
Johannes Rieken a34ee0c5aa label tweak 2017-10-10 17:09:36 +02:00
Johannes Rieken 9c4052804d adjust git colors 2017-10-10 17:09:35 +02:00
Johannes Rieken e73da33e4f add back untracked color, remove suffix for now 2017-10-10 17:09:35 +02:00
Johannes Rieken 73164106d5 simplify git decorations... 2017-10-10 17:09:34 +02:00
Johannes Rieken 5c109769f0 use ColorIdentifier instead of Color, define some git colors for untracked, modifed, and ignored 2017-10-10 17:08:53 +02:00
Joao Moreno bb23d1244e lock git @types deps
related to #35561
2017-10-04 13:38:41 +02:00
Joao Moreno bcb3e0d00e detect conflict markers when staging
fixes #33983
2017-10-03 10:21:20 +02:00
Joao Moreno a13fdcbf50 Repository.close
fixes #35041
2017-09-28 11:09:44 +02:00
Raoul D'Cunha 21aac84936 Add support for Stash (Include Untracked) 2017-09-20 17:06:52 +12:00
isidor 1559b68d09 git: open change enabled only for local files 2017-09-15 10:49:31 +02:00
Joao Moreno b1a7be798e add git.stageAll to provider menu
related to #34230
2017-09-13 09:18:09 +02:00
Joao Moreno c9e070991a remove close repo command 2017-08-31 16:12:10 +02:00
Joao b4fa7f2e27 fixes #33499 2017-08-30 15:25:15 +02:00
Joao 5b265e0cab fixes #33341 2017-08-30 13:02:20 +02:00
Joao 8f8bbff336 fixes #33325 2017-08-29 15:06:57 +02:00
Joao 2624eff8fe Merge branch 'master' into scm-multiroot 2017-08-25 11:36:39 +02:00
Joao Moreno e9798613ad git: gitOpenRepositoryCount 2017-08-23 16:25:20 +02:00
Joao Moreno ca068b3695 fix git.pullFrom group 2017-08-23 15:55:41 +02:00
Justin Horner e34b313026 Merge branch 'master' into justinhhorner-git-rename-branch 2017-08-21 22:51:06 -04:00