Commit Graph

632 Commits

Author SHA1 Message Date
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
Joao Moreno 618e3806c3 fix missing reference 2017-12-05 10:50:21 +01:00
Joao Moreno 6d5112610f fixes #38389 2017-12-04 15:43:14 +01:00
Joao Moreno 6e5e8abb16 fixes #35031 2017-12-04 15:16:07 +01:00
Johannes Rieken dbb0587032 fix #38852 2017-12-04 10:06:46 +01:00
Johannes Rieken 56196d4b08 work around slow configuration reading, #39329 2017-11-30 15:37:32 +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 9544e5faa0 git.enabled as a resource setting
fixes #37492
2017-11-27 16:08:15 +01:00
Joao Moreno 32d7bcd358 fixes #39173 2017-11-27 11:16:37 +01:00
Joao Moreno 548bfe91af disable auto fetch
fixes #34684
2017-11-24 11:12:45 +01:00
Joao Moreno 8feee8ebb9 fixes #39077 2017-11-24 07:59:51 +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
Matt Bierner d8e926be97 Mark most private static constants as private static readonly 2017-11-20 15:18:52 -08: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
Sindre Tellevik 924b1002bb Git branches sorted by committerdate, latest first. 2017-11-17 00:09:23 +01:00
Nick Snyder 89b9d1e40a ensure all cases are handled
By removing the default case and undefined from the return type, the type system can ensure that all cases are handled.
2017-11-14 16:50:08 -08:00
Joao Moreno 4e172cd197 fixes #38244 2017-11-13 20:20:58 +01:00
Joao Moreno 322bd6136a fix no-unexternalized-strings rule 2017-11-13 11:13:07 +01:00
cleidigh 0dd4c4920e Fix checkIgnore Promise/resolve bug 2017-11-12 18:37:00 -05:00
Joao Moreno fe20886713 don't spawn git on Windows
fixes #32739
2017-11-10 17:50:13 +01:00
Joao Moreno 2fedc4c253 git rename: missing update 2017-11-10 17:39:20 +01:00
Joao Moreno ffefea2053 Merge branch 'fix-changes-display-for-modified-files' of https://github.com/thierer/vscode into thierer-fix-changes-display-for-modified-files 2017-11-10 17:24:28 +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
Johannes Rieken 5ca4bab8fc use -z --stdin when running check-ignore, qualified guess for #37857 2017-11-10 10:05:01 +01:00
Joao Moreno de84b63e47 fix compile error 2017-11-09 18:23:12 +01:00