cac9991579
fixes #56504
2018-09-19 16:23:54 +02:00
08c2ce4910
fixes #54407
2018-09-19 16:02:56 +02:00
4e3f58f2f4
git: handle deleted conflicts
...
fixes #52787
2018-09-19 15:48:28 +02:00
7f9b85612d
fixes #49902
2018-09-19 12:33:11 +02:00
42f6ffc872
fixes #49723
2018-09-19 11:54:09 +02:00
ba076500a8
missing await
2018-09-19 11:54:09 +02:00
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
31419e264a
fixes #39048
2018-09-18 16:23:35 +02:00
8a620ab5b8
fixes #18807
2018-09-18 11:20:21 +02:00
59892edc6e
fixes #18673
2018-09-18 11:13:12 +02:00
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
a798c5c754
check only dot at the end of the branch
2018-09-17 17:28:32 +02:00
2c0167ef99
git: getBranch should resolve @ name syntax
2018-09-14 10:14:50 +02:00
87dbb3a1a6
git: getConfig should trim result
2018-09-14 09:22:35 +02:00
2381d8f627
always show create a branch button
2018-09-13 21:53:07 +02:00
ccf247b2fb
fixes #50736
2018-09-13 18:15:55 +02:00
5215a5a619
💄
2018-09-13 17:37:52 +02:00
c555552d81
Merge commit 'refs/pull/58380/head' of github.com:Microsoft/vscode into pr/58380
2018-09-13 17:33:16 +02:00
c0021de2a1
💄
2018-09-13 17:29:28 +02:00
a6985d76b2
Merge commit 'refs/pull/58174/head' of github.com:Microsoft/vscode into pr/58174
2018-09-13 17:20:52 +02:00
4d46fb709c
cleanup git push force
2018-09-13 17:15:21 +02:00
aac29b412c
💄
2018-09-13 17:03:25 +02:00
9380225465
fix compilation errors
2018-09-13 17:02:49 +02:00
eaf1759f29
Merge commit 'refs/pull/53286/head' of github.com:Microsoft/vscode into pr/53286
2018-09-13 17:01:23 +02:00
4b2df59105
Merge branch 'pr/54300'
2018-09-13 16:07:41 +02:00
ca7ae00825
💄
2018-09-13 16:07:30 +02:00
9c06533ace
Merge commit 'refs/pull/54300/head' of github.com:Microsoft/vscode into pr/54300
2018-09-13 15:55:04 +02:00
86230c239c
Git rebase detection ( #57651 )
...
* Test #57299 - script to stage test data.
* Fix #57299 - improve git rebase detection
* Revert "Test #57299 - script to stage test data."
This reverts commit 5f7142c25a
2018-09-13 15:47:05 +02:00
6c504e7ee3
💄
2018-09-13 15:35:58 +02:00
406f710b39
Merge commit 'refs/pull/50712/head' of github.com:Microsoft/vscode into pr/50712
2018-09-13 15:25:42 +02:00
d9e06518f1
Merge pull request #57374 from Protolane/enhancement/replace-brackets-too-upon-creating-new-branch
...
#57373 Replace brackets as well upon creating a branch
2018-09-13 14:35:54 +02:00
d880689924
git: fetch from all remotes
...
fixes #56463
2018-09-12 16:21:11 +02:00
a915b67582
introduce git.fetchOnPull
...
related to #56463
2018-09-12 16:15:35 +02:00
9b0eee12d3
💄 commit empty
2018-09-12 15:46:40 +02:00
e2b2b5bc9d
Merge branch 'master', commit 'refs/pull/56048/head' of github.com:Microsoft/vscode into pr/56048
2018-09-12 15:37:41 +02:00
3f51b7fd11
Merge pull request #55975 from wistcc/WC/55915
...
Fixing text when reverting changes for deleted file
2018-09-12 15:31:34 +02:00
5455483afe
fix missing resource
2018-09-12 14:56:39 +02:00
51e471a663
Merge remote-tracking branch 'origin/master'
2018-09-12 14:54:36 +02:00
b920ce8583
💄
2018-09-12 14:54:22 +02:00
f82fcb8a0b
Merge commit 'refs/pull/55976/head' of github.com:Microsoft/vscode into pr/55976
2018-09-12 14:50:03 +02:00
15344fc6a4
Merge pull request #54897 from segevfiner/checkout-new-remote-branch
...
Try to checkout a new local branch when checking out a remote branch
2018-09-12 14:46:33 +02:00
24d9eeb9a8
Merge pull request #54867 from Hirico/master
...
Preserve the revealed area after using "Open File" from git-diff editor (fix #53465 )
2018-09-12 12:22:06 +02:00
405e853713
💄
2018-09-12 12:03:08 +02:00
fa1deaaa34
Merge commit 'refs/pull/52527/head' of github.com:Microsoft/vscode into pr/52527
2018-09-12 12:01:51 +02:00
7ffa9219ae
fixes #52037
2018-09-12 11:55:21 +02:00
07e7dac2e7
💄
2018-09-12 11:40:25 +02:00
f1ef0a7fbe
Merge commit 'refs/pull/51111/head' of github.com:Microsoft/vscode into pr/51111
2018-09-12 11:30:29 +02:00
f92afbdc3c
git: mergebase is a readonly operation
2018-09-11 11:46:02 +02:00
f329e748b9
Fix#35905
2018-09-10 20:46:00 +02:00
dec5ac9811
missing git api call forwarding
2018-09-10 15:26:57 +02:00
Joao Moreno
João Moreno
Sardorbek Pulatov
Jason Bright
Ivan Sučić