Commit Graph

264 Commits

Author SHA1 Message Date
Benjamin Pasero b939d90808 fix #40224 2018-01-16 18:04:46 +01:00
Joao Moreno 29e83090b3 fixes #32681 2017-12-19 10:09:13 +01:00
Joao Moreno 590d36f948 fixes #40439 2017-12-18 16:04:24 +01:00
Joao Moreno eb43c80ecc 💄 2017-12-15 16:17:39 +01:00
Joao Moreno bf741a1afd Merge branch 'fix/39738' of https://github.com/pfongkye/vscode into pfongkye-fix/39738 2017-12-15 16:14:47 +01:00
João Moreno bed86d2b63 Merge pull request #39216 from Dozed12/master
Show branches list in "git pull from"
2017-12-15 16:00:36 +01:00
Joao Moreno 55ae7e5cd5 git: fix opening deleted file 2017-12-15 15:44:06 +01:00
Joao Moreno fd6cdc91f4 cleanup stage/unstage submodule changes 2017-12-14 10:59:48 +01:00
Joao Moreno 9f131c1762 more submodule support, diff colorization 2017-12-13 16:21:12 +01:00
Joao Moreno 26b8508db1 Merge branch 'git-submodules' of https://github.com/petkahl/vscode into petkahl-git-submodules 2017-12-13 10:31:47 +01:00
João Moreno 2aa0d24cf6 Merge pull request #36420 from smbkr/push-ask-upstream
Git - Ask to publish branch if there is no upstream
2017-12-12 16:55:56 +01:00
Joao Moreno 7f64599c79 lipstick 2017-12-12 16:04:28 +01:00
Joao Moreno d56cea79f1 Merge branch 'unsaved-files-warning-when-commit' of https://github.com/pradeepmurugesan/vscode into pradeepmurugesan-unsaved-files-warning-when-commit 2017-12-12 10:47:53 +01:00
Joao Moreno 484cae0399 Merge branch 'bugfix/35645-git-stash-staged-files' of https://github.com/dKab/vscode into dKab-bugfix/35645-git-stash-staged-files 2017-12-11 17:38:59 +01:00
Joao Moreno 0636f54e90 💄 2017-12-11 17:30:50 +01:00
Joao Moreno 3b8e148a37 Merge branch 'master' of https://github.com/dKab/vscode into dKab-master 2017-12-11 17:27:17 +01:00
Joao Moreno 1a53332be7 align amend commit message preserving 2017-12-11 17:15:45 +01:00
Joao Moreno f5d5b5d6e5 Merge branch 'master' of https://github.com/matthewferderber/vscode into matthewferderber-master 2017-12-11 17:12:15 +01:00
Fong Kye Pascal 641e287bf6 fix: #39738
Replaces starting tilde with home directory when entered in git clone prompt
2017-12-08 21:05:43 +01:00
Joao Moreno ce38ff384e fixes #38298 2017-12-07 11:24:18 +01:00
Joao Moreno daf63a3ad1 fixes #39623 2017-12-06 18:10:35 +01:00
Joao Moreno 6e5e8abb16 fixes #35031 2017-12-04 15:16:07 +01:00
Francisco Moreira f0e2c7d5c4 Fix pull 2017-11-27 22:59:06 +00:00
Dozed12 7f2fd6b81e Show remote branches in 'git pull from'
As reequested in #37490
2017-11-27 16:09:25 +00:00
Dozed12 87efd09868 Revert "Show remote branches"
This reverts commit e567b71fbc.
2017-11-27 16:04:47 +00:00
Dozed12 e567b71fbc Show remote branches
Fixes #37492
2017-11-27 15:59:05 +00:00
Joao Moreno 548bfe91af disable auto fetch
fixes #34684
2017-11-24 11:12:45 +01:00
Joao Moreno 18f4237ded fixes #36785 2017-11-23 15:09:02 +01:00
Pradeep Murugesan 3a10793dad added a warning when user tries to commit, and there are unsaved files 2017-11-21 16:37:32 +01:00
Till e0bf4eb820 Reuse last commit message for amend
fixes #35182
2017-11-21 11:40:59 +01:00
Joao Moreno 9752f3c93c fix missing scm resources
fixes #35724
2017-11-17 16:30:37 +01:00
Joao Moreno 000325a03b alert when git is missing
fixes #38393
2017-11-17 11:35:49 +01:00
Joao Moreno 322bd6136a fix no-unexternalized-strings rule 2017-11-13 11:13:07 +01:00
Joao Moreno 2fedc4c253 git rename: missing update 2017-11-10 17:39:20 +01:00
Joao Moreno c3c4f5e8de 💄 2017-11-10 17:12:28 +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 1a20ec9103 💄 2017-11-10 16:27:56 +01:00
João Moreno 56539e2e25 Merge pull request #32222 from dericcain/master
Added ability to use tilde as home dir in config for cloning repos
2017-11-10 16:25:22 +01:00
Joao Moreno 55882309c8 git: cancel clone
fixes #30057
2017-11-10 16:22:12 +01:00
Joao Moreno e730a65f7a git image diff: fix index 2017-11-09 18:22:45 +01:00
Joao Moreno d1b9a70d17 git: data uris 2017-11-09 17:54:00 +01:00
Benjamin Pasero 7f0b0e1761 label/description 2017-11-08 15:48:45 +01:00
Joao Moreno 4b8c0ce265 git: raw buffer 2017-11-08 15:26:41 +01:00
Joao Moreno d572f43247 wip: git: send pngs as data uris 2017-11-08 12:52:30 +01:00
Joao Moreno d2016c4ad0 Merge branch 'master' into fix/33739 2017-11-08 12:27:48 +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
João Moreno d901df3fb0 any -> string 2017-11-08 10:34:44 +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