Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 22:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
117,051 Commits 3,760 Branches 361 Tags
3bf55cd5e60f10a4275afefd2a6803fb89ebab2e
Commit Graph

432 Commits

Author SHA1 Message Date
rebornix
f27183be67 add error code for git blame 2019-01-15 11:56:48 -08:00
Haritha Wickremasinghe
23058bece6 When resolving a merge conflict allow accepting the default commit message 
Fixes #6403
 2019-01-14 13:22:03 -05:00
rebornix
e5a596be29 add git blame api 2019-01-11 13:10:54 -08:00
Ilya Biryukov
04c3dde6e4 Address PR feedback on Git provide APIs 2019-01-07 11:38:33 -08:00
Joao Moreno
ff157f90a0 add unshallow as an option for git pull 2019-01-07 11:22:26 +01:00
Joao Moreno
bba335ab63 Merge commit 'refs/pull/65786/head' of github.com:Microsoft/vscode into pr/65786 2019-01-07 11:15:18 +01:00
Rich Evans
f1e2a0a2b5 Try naiive rev-parse for branches beginning with @ to see if they resolve, before replacing with symbolic full name version. 2019-01-05 16:05:13 -08:00
Rob Lourens
ef2547d547 replace void 0 with undefined 2019-01-03 11:20:19 -08:00
Peng Lyu
94a04621dd Fix microsoft/vscode-pull-request-github#612. Allow fetching with limited depths 2018-12-28 12:02:28 -08:00
joaorreis
6dbf6b5857 fixed 2018-12-17 14:47:35 +00:00
Ilya Biryukov
01292b4174 Add Git log, globalConfig, and tree diff API 2018-12-11 14:04:34 -08:00
Darrien Singleton
378cd7abd9 Merge branch 'master' into gitcloneissue 2018-12-07 14:16:14 -05:00
Rachel Macfarlane
e27511826f Add GitErrorCode to apply command 2018-12-07 10:21:03 -08:00
Luo Wenqing
a84421bbb3 Merge branch 'master' into fix-branch-checkout 2018-11-25 21:09:46 +08:00
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
laphets
d24031bf45 Fix some typo 
Update extensions/git/src/api/git.d.ts

Fix another typo

Fix some typo
 2018-10-18 10:55:42 +08:00
laphets
d8aaf716c4 Fulfill local branch checking when checkout to an remote branch 2018-10-17 23:31:57 +08:00
OneThatWalks
e002fc6afa Git clone fix to use basename 2018-10-17 00:30:39 -04:00
Scott Craig
1db0f5271d Fix git problems with spaces 2018-10-10 20:11:00 -04: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