Commit Graph

567 Commits

Author SHA1 Message Date
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
5f87a2ad40 properly handle git uris in getOpenRepository
fixes #40408
2017-12-18 10:59:48 +01:00
Joao Moreno
424c9da7cc improve git.autofetch suggestion
fixes #40282
2017-12-18 09:10:11 +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
João Moreno
8f76a4d0d3 Merge pull request #38563 from graknol/master
Git branches sorted by committerdate, latest first.
2017-12-15 15:51:10 +01:00
Joao Moreno
588eb52b33 remove unecessary | undefined 2017-12-15 15:46:13 +01:00
Joao Moreno
374920a139 Merge branch 'status' of https://github.com/nicksnyder/vscode into nicksnyder-status 2017-12-15 15:45:11 +01:00
Joao Moreno
55ae7e5cd5 git: fix opening deleted file 2017-12-15 15:44:06 +01:00
Joao Moreno
920a282c16 just move a single repository up 2017-12-15 15:21:31 +01:00
Joao Moreno
71701f982d Merge branch 'repo-rank' of https://github.com/keegancsmith/vscode into keegancsmith-repo-rank 2017-12-15 15:05:13 +01:00
Joao Moreno
9622ada626 find git in LocalAppData and PATH, win32
fixes #40229
2017-12-15 10:38:02 +01:00
Joao Moreno
c66a91bc67 hook open/close repository events to decoration change event 2017-12-14 16:28:26 +01:00
Joao Moreno
ea831c196a fixes #40156 2017-12-14 16:15:38 +01:00
Joao Moreno
b7fad651ac fix bad uri duplication 2017-12-14 15:07:25 +01:00
Joao Moreno
cbb59c682f fix git submodule decoration 2017-12-14 12:39:44 +01:00
Joao Moreno
3017bc0f9c git submodule decorations 2017-12-14 12:03:54 +01:00
Joao Moreno
c84266207a revert submodule change with update command 2017-12-14 11:21:27 +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
0cd53b2d9b 💄 2017-12-13 12:50:21 +01:00
Joao Moreno
13bb4c9b85 detect submodules, make them a part of status 2017-12-13 12:03:53 +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
Joao Moreno
238db1cb90 Merge branch 'jayjun-commit-counter' 2017-12-12 17:55:07 +01:00
Joao Moreno
946d872acb input box length warnings
introduces scm.inputCounter
2017-12-12 17:54:28 +01:00
Joao Moreno
7b4bb1ed2b Merge branch 'commit-counter' of https://github.com/jayjun/vscode into jayjun-commit-counter 2017-12-12 16:57:27 +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
135b261f88 fixes #40079 2017-12-12 16:04:28 +01:00
Joao Moreno
7f64599c79 lipstick 2017-12-12 16:04:28 +01:00
Joao Moreno
feb80a6de8 Merge branch 'pradeepmurugesan-unsaved-files-warning-when-commit' 2017-12-12 10:48:10 +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
Johannes Rieken
41ba9e6632 fix #40078 2017-12-12 10:37:14 +01:00
Joao Moreno
6793990e25 move autoRepositoryDetection implementation 2017-12-11 17:51:40 +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
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
Joao Moreno
5eb9a10932 Merge branch 'git_line_fix' of https://github.com/Jeyanthinath/vscode into Jeyanthinath-git_line_fix 2017-12-11 17:05:16 +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
Tan Jay Jun
c407635fdf Add warningLength to SourceControlInputBox 2017-12-08 12:53:19 +08:00
Joao Moreno
a95ad23b04 fixes #38245 2017-12-07 17:23:35 +01:00
Joao Moreno
86421af3a7 fixes #37810 2017-12-07 15:06:31 +01:00
Joel Kuntz
454bf5bdce Fix #39867 fix git popStash type check 2017-12-07 08:53:05 -04: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
f3b04c11f7 fixes #39690 2017-12-06 12:49:08 +01:00