Commit Graph

323 Commits

Author SHA1 Message Date
João Moreno
b3f85bc76d fix git branch sort order (#80096) 2019-08-30 10:27:20 +02:00
Xhulio Hasani
32d59ba806 Added quickpick option and display of tag annotation on menu 2019-08-20 16:05:46 -04:00
Joao Moreno
22a3f3ec83 💄 2019-08-13 09:54:20 +02:00
Joao Moreno
2c878484c8 Merge commit 'refs/pull/78695/head' of github.com:microsoft/vscode into pr/78695 2019-08-13 09:46:54 +02:00
Joao Moreno
264d6ac829 💄 2019-08-12 14:06:53 +02:00
Joao Moreno
28bcf28232 Merge commit 'refs/pull/78562/head' of github.com:microsoft/vscode into pr/78562 2019-08-12 09:41:30 +02:00
Xhulio Hasani
98ed0fc2e8 Merge branch 'master' of https://github.com/microsoft/vscode 2019-08-11 19:50:41 -04:00
Joao Moreno
2c189f373f fix capture group 2019-08-08 16:38:39 +02:00
Joao Moreno
daf581da39 fixes #71258 2019-08-08 16:30:47 +02:00
skprabhanjan
1556800102 Fix fix-64077 With a setting 2019-08-08 16:14:23 +05:30
Joao Moreno
5481dcca5e Merge commit 'refs/pull/71710/head' of github.com:microsoft/vscode into pr/71710 2019-08-08 12:17:46 +02:00
Joao Moreno
181759fe6a add git.smartCommitChanges 2019-08-08 11:55:13 +02:00
João Moreno
b8a8085ad1 Merge branch 'master' into rievans/gitpushbranchwithsymbolfail 2019-08-07 11:51:55 +02:00
Joao Moreno
a6177d979a cleanup for pr #66095 2019-08-06 17:49:42 +02:00
Darrien Singleton
b93c4fa3b5 new branch 2019-08-06 09:22:17 -04:00
Joao Moreno
54c6639bf8 add git.supportCancellation setting 2019-08-06 14:15:47 +02:00
João Moreno
721385ff4d Merge branch 'master' into gitcloneissue 2019-08-05 17:08:13 +02:00
Drew Cross
d235f183c6 addressing additional comments 2019-07-14 17:49:22 -07:00
Drew Cross
a047914487 Adding git stash drop for issue 76195 2019-06-29 07:19:20 -07:00
Xhulio Hasani
8173fb9a92 Merge branch 'master' of https://github.com/microsoft/vscode 2019-06-28 23:06:25 -04:00
ozyx
a9672ad746 remove trailing '/' from repo url for baseFolderName 2019-06-20 00:36:34 -07:00
Joao Moreno
5f70390f0d fixes microsoft/vscode-remote-release#671 2019-06-13 10:02:23 +02:00
Joao Moreno
4a3c056e9a use --follow-tags instead of --tags when pushing
fixes #70081
fixes #75240
2019-06-12 11:06:54 +02:00
Joao Moreno
13d0dad699 fix #41085 2019-06-12 10:38:35 +02:00
Joao Moreno
a83c9a4756 fixes #74844 2019-06-05 10:22:48 +02:00
Joao Moreno
afa4faa587 fix git extension tests 2019-06-05 10:22:48 +02:00
Darrien Singleton
69158eb58b Git clone fix to use character set in regex 2019-05-29 06:39:12 -04:00
Darrien Singleton
0bf7825bc2 Revert "Git clone fix to use character set in regex"
This reverts commit fdb1c37b06.
2019-05-29 06:36:34 -04:00
Darrien Singleton
fdb1c37b06 Git clone fix to use character set in regex 2019-05-29 06:35:02 -04:00
Darrien Singleton
a3081451e9 Merge branch 'master' into gitcloneissue 2019-05-27 11:27:58 -04:00
Joao Moreno
f454c2c402 💄 2019-05-27 15:40:23 +02:00
Joao Moreno
5540e01820 Merge commit 'refs/pull/61149/head' of github.com:Microsoft/vscode into pr/61149 2019-05-27 15:20:08 +02:00
Xhulio Hasani
c125f8ed7b added deleteTag 2019-05-26 01:20:24 -04:00
Hao Hu
2058f27615 Add git.pullTags setting 2019-05-23 11:28:28 +02:00
Rachel Macfarlane
a5455afcef Add DirtyWorkTree git error matching to git exec (#73108) 2019-05-03 14:04:27 -07:00
Vitaliy Mazurenko
b3401b2163 fix commit template message whitespace removing #71312 2019-04-08 18:19:28 +03:00
Jon Bockhorst
fb0feb1c86 Show git clone progress bar and percentage 2019-03-28 09:07:09 -05:00
João Moreno
86ca253edf Merge pull request #60573 from scottymcraig/FixGitSpacesIssue
Fixes Git Clone Problem with Spaces
2019-03-08 10:06:25 +01:00
Joao Moreno
2c75fe1906 fixes #69063 2019-02-21 09:44:20 +01:00
Joao Moreno
ae5bb90724 fixes #68874 2019-02-19 10:55:31 +01:00
Joao Moreno
37fbae08a4 Merge commit 'refs/pull/64826/head' of github.com:Microsoft/vscode into pr/64826 2019-01-28 15:34:23 +01:00
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