Commit Graph

1118 Commits

Author SHA1 Message Date
Vladimir Kotikov
ae2d0cd96f Add option to automatically stash changes before performing git pull 2018-10-02 22:49:46 +03:00
Matt Bierner
6d11792abf Change the git extension to use shared tsconfig 2018-10-02 10:24:19 -07:00
Jeremy Shore
7761add538 Fix #57910 - Add setting for auto fetch timeout
Finishes the race condition when either setting is changed, and then if it wasn’t disabled creates a new timeout using the new value (instead of waiting for it to go through the loop again to update).
2018-10-01 14:35:45 -05:00
Christof Marti
54c51f2f23 QuickPickItem.alwaysShow (#59232) 2018-10-01 16:39:00 +02:00
Ryan Scott
6cc0f06531 Add git.fetchPrune 2018-09-30 19:38:48 -05:00
Joao Moreno
707787c5b8 update yarn.lock files to use integrity 2018-09-30 16:34:43 +02:00
Joao Moreno
087ee56e75 fixes #47141 2018-09-28 08:50:47 +02:00
Joao Moreno
6335da987d Merge commit 'refs/pull/59131/head' of github.com:Microsoft/vscode into pr/59131 2018-09-27 09:45:55 +02:00
Joao Moreno
58fe02e79b Revert "cancelled git.checkout"
This reverts commit a488569052.
2018-09-27 09:42:35 +02:00
Joao Moreno
77c8657a86 improve setting description
related to #50394
2018-09-27 09:42:22 +02:00
Rachel Macfarlane
ee955d45e3 rebase and remove check in catch 2018-09-26 17:27:24 -07:00
Rachel Macfarlane
f50b87442c Return whether git.checkout succeeded 2018-09-26 17:25:40 -07:00
Ramya Achutha Rao
972ee3f948 Use latest applicationinsights in extensions too 2018-09-25 16:45:00 -07:00
Joao Moreno
b862885245 fixes #47141 2018-09-24 14:24:46 +02:00
Joao Moreno
d47474c557 git init: show picker earlier 2018-09-24 12:38:21 +02:00
Joao Moreno
a488569052 cancelled git.checkout 2018-09-24 11:08:35 +02:00
Christian Alexander
9d946009ff feat(git): add display handling of files added by git add -N 2018-09-22 10:08:48 -07:00
Joao Moreno
7c2d950958 git: cache isFreshRepository
related to #57854
2018-09-20 16:18:50 +02:00
Johannes Rieken
5037516238 updated lock files 2018-09-20 12:06:55 +02:00
Johannes Rieken
6999ddbab7 update vscode-extension-telemetry 2018-09-20 12:06:55 +02:00
Joao Moreno
ac3d5c93ca git: expose repository ui state 2018-09-20 10:21:31 +02:00
Alex Dima
34e7a220c8 Avoid shipping unnecessary files 2018-09-19 19:53:46 +02:00
Joao Moreno
cac9991579 fixes #56504 2018-09-19 16:23:54 +02:00
Joao Moreno
08c2ce4910 fixes #54407 2018-09-19 16:02:56 +02:00
Joao Moreno
4e3f58f2f4 git: handle deleted conflicts
fixes #52787
2018-09-19 15:48:28 +02:00
Joao Moreno
7f9b85612d fixes #49902 2018-09-19 12:33:11 +02:00
Joao Moreno
42f6ffc872 fixes #49723 2018-09-19 11:54:09 +02:00
Joao Moreno
ba076500a8 missing await 2018-09-19 11:54:09 +02:00
João Moreno
8a142f5b81 Merge pull request #58731 from oneslash/new_branch_if_no_other_found
always show create a branch button
2018-09-19 10:28:17 +02:00
Ramya Achutha Rao
d0a67178ca Update appinsights in built in extensions 2018-09-18 18:35:12 -07:00
Joao Moreno
31419e264a fixes #39048 2018-09-18 16:23:35 +02:00
Joao Moreno
8a620ab5b8 fixes #18807 2018-09-18 11:20:21 +02:00
Joao Moreno
59892edc6e fixes #18673 2018-09-18 11:13:12 +02:00
João Moreno
d26c044f3d Merge pull request #58825 from oneslash/58816
check only dot at the end of a branch
2018-09-18 10:29:47 +02:00
Sardorbek Pulatov
a798c5c754 check only dot at the end of the branch 2018-09-17 17:28:32 +02:00
Joao Moreno
2c0167ef99 git: getBranch should resolve @ name syntax 2018-09-14 10:14:50 +02:00
Joao Moreno
87dbb3a1a6 git: getConfig should trim result 2018-09-14 09:22:35 +02:00
Sardorbek Pulatov
2381d8f627 always show create a branch button 2018-09-13 21:53:07 +02:00
Miguel Solorio
337c626b07 Make ignored folders darker 2018-09-13 09:44:47 -07:00
Joao Moreno
ccf247b2fb fixes #50736 2018-09-13 18:15:55 +02:00
Joao Moreno
5215a5a619 💄 2018-09-13 17:37:52 +02:00
Joao Moreno
c555552d81 Merge commit 'refs/pull/58380/head' of github.com:Microsoft/vscode into pr/58380 2018-09-13 17:33:16 +02:00
Joao Moreno
c0021de2a1 💄 2018-09-13 17:29:28 +02:00
Joao Moreno
a6985d76b2 Merge commit 'refs/pull/58174/head' of github.com:Microsoft/vscode into pr/58174 2018-09-13 17:20:52 +02:00
Joao Moreno
4d46fb709c cleanup git push force 2018-09-13 17:15:21 +02:00
Joao Moreno
aac29b412c 💄 2018-09-13 17:03:25 +02:00
Joao Moreno
9380225465 fix compilation errors 2018-09-13 17:02:49 +02:00
Joao Moreno
eaf1759f29 Merge commit 'refs/pull/53286/head' of github.com:Microsoft/vscode into pr/53286 2018-09-13 17:01:23 +02:00
Joao Moreno
4b2df59105 Merge branch 'pr/54300' 2018-09-13 16:07:41 +02:00
Joao Moreno
ca7ae00825 💄 2018-09-13 16:07:30 +02:00