Commit Graph

2064 Commits

Author SHA1 Message Date
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
Johannes Rieken 4976cffba7 Merge pull request #73890 from markspanbroek/master
Support negated .gitignore rules.
2019-05-24 15:18:05 +02:00
Hao Hu 2058f27615 Add git.pullTags setting 2019-05-23 11:28:28 +02:00
Mark Spanbroek 4f8311c149 Support negated .gitignore rules.
Fixes issues #69035 and #38112.
2019-05-17 14:28:18 +02:00
Rachel Macfarlane a5455afcef Add DirtyWorkTree git error matching to git exec (#73108) 2019-05-03 14:04:27 -07:00
Oxirt c0cca64e3c allow Git: fetch command to show password prompt
There was some 2 years old code which was preventing `Git: fetch` command from displaying a password prompt. I've removed this special treatment. Tested, now `Git: fetch` is showing password prompt as expected and the operation is also successful.
2019-04-19 22:03:08 +05:30
Sandeep Somavarapu 1fd2993b54 Fix #72185 2019-04-12 07:44:56 +02:00
Vitaliy Mazurenko b3401b2163 fix commit template message whitespace removing #71312 2019-04-08 18:19:28 +03:00
Joao Moreno f0772536de fixes #71355 2019-04-01 16:39:34 +02:00
Jon Bockhorst 1297fb0431 Confirm undo commit if its a merge commit 2019-03-31 23:59:46 -05:00
Jon Bockhorst 282c57b8d9 Add remote option when publishing branch 2019-03-28 22:54:59 -05:00
Jon Bockhorst fb0feb1c86 Show git clone progress bar and percentage 2019-03-28 09:07:09 -05:00
Joao Moreno bfb02a7d84 ...
related to #70812
2019-03-27 13:26:39 +01:00
Joao Moreno f50b46c334 fixes #70985 2019-03-25 11:56:30 +01:00
Joao Moreno 6824561046 fixes #70812 2019-03-20 09:34:26 +01:00
ipmsteven 49e0e2607c add logic to skip staging untracked files when onlyTrackedFilesCanBeAutoStaged is on 2019-03-14 23:48:24 -07:00
ipmsteven 4935612fe6 introduce onlyTrackedFilesCanBeAutoStaged feature flag 2019-03-14 23:23:11 -07:00
Josh Leeb-du Toit 05ed3df9b8 Add option to hide git sync button in status bar
This PR adds the option `git.statusBarSync.enabled` which when set to `false`
will hide the `SyncStatusBar` icon that is, by default, visible in the status
bar.
2019-03-15 17:11:32 +11:00
Joao Moreno 7ccfdd3a00 do not sanitize remote url 2019-03-08 10:15:28 +01:00
Joao Moreno 9fb1a067b6 Merge branch 'master', commit 'refs/pull/60640/head' of github.com:Microsoft/vscode into pr/60640 2019-03-08 10:07:10 +01: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 94f7ae74c5 fixes #69529 2019-03-05 11:15:49 +01:00
Joao Moreno 3021254e19 Merge branch 'pr/60426' 2019-03-05 10:41:38 +01:00
Joao Moreno 4f197a7079 💄 2019-03-05 10:41:16 +01:00
Joao Moreno 9834042b3c Merge commit 'refs/pull/60426/head' of github.com:Microsoft/vscode into pr/60426 2019-03-05 10:30:00 +01:00
Johannes Rieken 1eb6de1daf clean up some todos 2019-03-05 10:16:07 +01:00
Johannes Rieken 4c593835a1 fix compile error 2019-03-04 12:54:54 +01:00
Abby 455cdf3955 remove unused dependency (to fix CI) 2019-03-04 14:50:27 +09:00
Abby 608035ad49 Add an option to allow to open in new window after -
git initializing or cloning
2019-03-04 14:37:58 +09:00
Neeson 5745337506 Fixes #69240 2019-02-27 16:08:14 +08:00
Joao Moreno 2c75fe1906 fixes #69063 2019-02-21 09:44:20 +01:00
Joao Moreno 11f54085c0 fixes #68918 2019-02-21 09:32:39 +01:00
Joao Moreno 5c049a93ae fixes #68894 2019-02-19 10:58:59 +01:00
Joao Moreno ae5bb90724 fixes #68874 2019-02-19 10:55:31 +01:00
Benjamin Pasero e2d1fd06d1 debt - update extensions node dependency to 10.x 2019-02-07 08:49:36 +01:00
Alex Ross b0b6dc6c2e Update grammars to pick up make changes
and fix hashes.
2019-02-06 15:16:49 +01:00
Alex Ross 6e968190df Update grammars 2019-02-04 16:35:48 +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
Phil Marshall 957f809e4d update strings for prompt to save staged files 2019-01-25 21:16:53 -06:00
Phil Marshall 3cfd860344 git prompts to save only staged files 2019-01-25 21:16:00 -06:00
João Moreno 65fcf3180b Merge pull request #66416 from Microsoft/rebornix/git-blame
add git blame api
2019-01-16 09:17:44 +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
SteVen Batten ccdd2997a6 update AI module (#66370)
fixes #64849
2019-01-10 17:43:25 -08:00