Commit Graph

287 Commits

Author SHA1 Message Date
João Moreno
c3942c67b1 Merge pull request #52145 from NahomAgidew/master
Remove inline git revert confirmation alert (Issue #43625)
2018-06-18 10:54:49 +02:00
João Moreno
4e575be919 Merge pull request #49167 from chenhowa/git-errors
Await git.pullFrom and gitt.pushTo to ensure any failures display an …
2018-06-18 10:52:46 +02:00
Nahom Abi
04aba36883 Remove inline git revert confirmation alert (Issue #43625) 2018-06-15 15:36:33 -07:00
Joao Moreno
57aabf1c42 smoketest: more debug 2018-06-08 21:48:46 +02:00
Joao Moreno
b48174153e git: parenthesis 2018-06-08 21:24:58 +02:00
Joao Moreno
534060f381 smoketest: more debug 2018-06-08 21:24:15 +02:00
Joao Moreno
1ceb8d6d22 smoketest: more logging 2018-06-08 21:00:10 +02:00
Joao Moreno
c6b40b8f63 smoketest: add logging 2018-06-08 20:08:34 +02:00
Joao Moreno
c693ba29c3 git: 💄 no_push feature 2018-06-04 16:48:47 +02:00
Joao Moreno
fb29dd0706 Merge commit 'refs/pull/45341/head' of github.com:Microsoft/vscode into pr/45341 2018-06-04 16:33:06 +02:00
Joao Moreno
30317e97bd beware of keybinding command null arguments
fixes #50821
2018-06-01 14:11:54 +02:00
Joao Moreno
98601ceb2c careful with path comparisons on windows
related to #50760
2018-05-30 09:21:46 +02:00
Howard Chen
a5f304f5f1 Await git.pullFrom and gitt.pushTo to ensure any failures display an error dialog to the user 2018-04-28 21:06:17 -07:00
Joao Moreno
d1380912cf use native dialog for git clone
fixes #48492
2018-04-26 11:33:16 +02:00
Joao Moreno
f765117b95 add workspace folder after git clone
fixes #48738
2018-04-26 11:20:06 +02:00
Joao Moreno
c2f0c40f25 use progress notification API for git clone
fixes #48692
2018-04-26 10:12:30 +02:00
Florian Traber
67b3957473 #46860 make git delete popup modal 2018-04-01 09:39:41 +02:00
Tomáš Hübelbauer
21325bef88 Hide ahead push arrow if remote push URL is no_push
Closes Microsoft/vscode#45271
2018-03-08 22:02:29 +01:00
Joao Moreno
e7a96243af improve pull/push specificity 2018-03-08 10:44:26 +01:00
Joao Moreno
efda2abf54 fixes #44715 2018-03-07 15:44:53 +01:00
Joao Moreno
c889303366 fixes #44802 2018-03-02 17:32:33 +01:00
Joao Moreno
ca58c21bfc fixes #44188 2018-02-22 10:22:19 +01:00
Joao Moreno
41886d2793 fix smoketests 2018-01-26 11:36:40 +01:00
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