DEV/microsoft_vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-20 00:04:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
43,034 Commits 3,582 Branches 356 Tags
Commit Graph

164 Commits

Author SHA1 Message Date
João Moreno
66f717cfa6
Merge pull request #60104 from mathiasvr/fix-60002 
Fix #60002 Undo last commit: keep staged files
 2018-11-20 09:59:42 +01:00
Joao Moreno
6052fcf07f Merge commit 'refs/pull/59735/head' of github.com:Microsoft/vscode into pr/59735 2018-11-20 09:43:16 +01:00
Rachel Macfarlane
ad5f5ea365 Expose 'apply' and 'diff --cached' from git extension API 2018-11-13 16:18:37 -08:00
Mathias Rasmussen
f3c7ce2a05 Fix #60002 Undo last commit: keep staged files 2018-10-07 18:59:35 +02:00
Ryan Scott
4b4fa8c66d Clarify git prune 2018-10-02 19:00:51 -05:00
Matt Bierner
dd3e2d94f8 Remove use strict directives in extension code 
We compile with alwaysStrict so these directives are not needed
 2018-10-02 16:02:44 -07:00
Ryan Scott
6cc0f06531 Add git.fetchPrune 2018-09-30 19:38:48 -05:00
Joao Moreno
b862885245 fixes #47141 2018-09-24 14:24:46 +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
42f6ffc872 fixes #49723 2018-09-19 11:54:09 +02:00
Joao Moreno
ba076500a8 missing await 2018-09-19 11:54:09 +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
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
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
9c06533ace Merge commit 'refs/pull/54300/head' of github.com:Microsoft/vscode into pr/54300 2018-09-13 15:55:04 +02:00
Joao Moreno
d880689924 git: fetch from all remotes 
fixes #56463
 2018-09-12 16:21:11 +02:00
Joao Moreno
9b0eee12d3 💄 commit empty 2018-09-12 15:46:40 +02:00
Joao Moreno
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
João Moreno
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
nesukun
907a021f74 Add support for force push and force-with-lease 2018-09-08 23:40:07 +01:00
Git-Lior
63748f8088 no user.email/user.name error message now shows current values 2018-09-07 14:40:23 +03:00
Joao Moreno
6e909d4132 git: expose error codes in API 2018-08-24 12:24:37 +02:00
Joao Moreno
103715c3cc git: implement API 2018-08-24 12:04:29 +02:00
Joao Moreno
28d2b5d2d6 wip: git api 2018-08-24 11:19:05 +02:00
Joao Moreno
6d2598ad88 git api: repository state 2018-08-24 11:16:49 +02:00
Joao Moreno
f9982d29d4 git api: make cwd mandatory 2018-08-22 13:06:26 +02:00
Tom Basche
bf3b694738 Add --allow-empty option 2018-08-09 11:52:33 +10:00
Segev Finer
6bf1b8bbec Try to checkout a new local branch when checking out a remote branch 
This handles the case when no local branch exists. You will get an error
if a local branch with the same name already exists. Better behavior for
this case can be implemented later.

Fixes #54601
 2018-07-24 01:41:48 +03:00
Joao Moreno
bcdad4c79f fixes #53520 2018-07-18 11:12:06 +02:00
Konstantin Müller
c56219e13d #54204 add commands to apply stash 2018-07-14 10:01:47 +02:00
Joao Moreno
19df280c7f fixes #53849 2018-07-09 10:37:51 +02:00
Joao Moreno
b6781b0058 align lstree implementations 2018-07-06 16:45:03 +02:00
Joao Moreno
00a1abe912 cleanup git relative path calculation 2018-07-06 16:37:53 +02:00
Joao Moreno
3f9e71722d Merge commit 'refs/pull/49397/head' of github.com:Microsoft/vscode into pr/49397 2018-07-06 15:46:10 +02:00
Joao Moreno
ba98812272 💄 2018-07-06 15:31:43 +02:00
Joao Moreno
e4d42b6b9b Merge commit 'refs/pull/47578/head' of github.com:Microsoft/vscode into pr/47578 2018-07-06 15:23:18 +02:00
Joao Moreno
e045147e44 improve conflicts during git rebase flow 2018-07-06 12:15:27 +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
Alex Ross
375411e631 Fixes #48714: Added conversion from local case of the file to git case. This does not fix the view in the Explorer, but this solution should be easy to apply to that issue too. 2018-05-07 11:37:17 -07:00
Joao Moreno
02bcbbc8da pick different folder names for git clone 
fixes #48485
 2018-04-26 11:33:55 +02:00
Joao Moreno
5ded9d963a cleanup git clone error 
fixes #48486
 2018-04-25 19:31:05 +02:00
Joao Moreno
8b69e6db6b fixes #46854 2018-04-25 15:40:45 +02:00
Joao Moreno
7cf50421da fixes #48211 2018-04-25 09:04:41 +02:00
Ryuichi Inagaki
6b7a644082 ref #44776 Only test the logic of parsing git show output 
* Instead of testing it through `getCommit` as we don't use stub in test
 2018-04-11 20:02:20 +10:00