Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-23 07:16:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
132,397 Commits 5,253 Branches 391 Tags
cebb5e5a055eeb35925c542db6cf39fbfb5e95d0
Commit Graph
2678 Commits
Author SHA1 Message Date
Johannes ce01702bbe make git "accept from merge editor" command save the document and close the merge editor (uses heuristic to identify merge editor tab) 2022-05-25 17:43:02 +02:00
Jonas DellingerandLadislau Szomoru 97f8e66d74 A full editor can be used as git commit message editor (#95266) 
Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2022-05-25 17:16:10 +02:00
Johannes 38931b6a3d add git.experimental.mergeEditor setting to enable/disable merge editor for conflicting files 2022-05-25 17:08:15 +02:00
Logan Ramos 3a8b1fe03e More telemetry comments (#150303) 
* Add owners to all telemetry events

* More comments

* Add comments to non typescript GDPR annotation

* Another comment
 2022-05-24 16:00:55 -07:00
Ladislau Szomoru 3e83fa95b0 Fix #150266 (#150267) 2022-05-24 15:06:34 +02:00
Johannes c87131372a Merge branch 'main' into 3wm 2022-05-24 14:09:17 +02:00
Johannes 7a51178618 git should open merge editor with detail and description (tag and commit-hash) 2022-05-17 13:46:42 +02:00
Ladislau Szomoru 38de430140 Add scope for settings (#149696) 2022-05-17 12:41:45 +02:00
Johannes 3aac77dc5d Merge branch 'main' into 3wm 2022-05-16 09:53:59 +02:00
Ladislau Szomoru 42ec698ec9 Git - Add trace level telemetry to repository discovery (#149469) 
* Add trace level telemetry to help investigate repository scan issues

* Remove empty line

* Switch back to the localized warning message
 2022-05-13 16:31:28 +02:00
Ladislau SzomoruandJoão Moreno a28eab6873 Git - branch protection (#149360) 
* Initial implementation of branch protection

* Pull request feedback

* Update extensions/git/src/commands.ts

Co-authored-by: João Moreno <joao.moreno@microsoft.com>
 2022-05-13 02:15:01 -07:00
John Murray 479abbf95e Add "Open Containing Folder" etc to file context menu in Git SCM view (#149150) 
* Add "Open Containing Folder" etc to file context menu in Git SCM view

Caption is "Reveal in Finder" on macOS and "Reveal in File Explorer" on Windows.
This resolves #137828

* Use multiple decorators on a method to simplify code
 2022-05-13 09:48:36 +02:00
Johannes abd3e66bac use git-fs to read base, ours, and theirs 2022-05-11 12:04:04 +02:00
Johannes 286333fffb Merge branch 'main' into 3wm 2022-05-11 09:44:08 +02:00
Joyce ErandLadislau Szomoru c5da5332d5 git: validate URI for clone command (#149180) 
Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2022-05-10 11:32:02 -07:00
Ladislau Szomoru b44e3caa96 Git - branch prefix + random name generation (#149069) 2022-05-10 15:14:52 +00:00
Johannes 983fc7a6b6 connect floating button to a menu and contribute to that from git 2022-05-10 16:14:28 +02:00
Johannes 5971d31881 (prototype) use _open.mergeEditor from git extension for files under conflict 2022-05-10 15:09:35 +02:00
Tyler James Leonhardt 73ccdb7675 Inform the user the actual branch name that will be used in the branchName inputbox (#148964) 2022-05-09 18:03:17 +02:00
Ladislau Szomoru ce88518440 Git - logging improvements (#148656) 2022-05-05 12:52:26 +00:00
Benjamin Pasero c6bd448948 debt - bring @types/mocha up to date with version 9.x 2022-05-02 08:30:27 +02:00
Harald Kirschner 781d0e4a94 Fixing #146093 2022-04-28 10:14:51 -07:00
Tyler Leonhardt 59cdc58ea0 update a few nls files with comments to ensure buttons don't get messed up 2022-04-27 14:26:48 -07:00
Benjamin Pasero fbdc6d0352 git - use different icon for uncomitted changes (#145781) 2022-04-23 09:44:45 +02:00
Ladislau Szomoru c2752e654f Fix hygiene 2022-04-22 16:03:12 +02:00
Eric Amodio 1b8ca287a0 Fixes #140787 watches proper worktree dir (#140789) 2022-04-22 15:50:13 +02:00
João Morenoand@lszomoru 2e2654c97f address heuristic when stage ranges act on same line number diff (#145899) 
Co-authored-by: @lszomoru
Fixes: #126989
 2022-04-22 12:31:15 +02:00
Johannes 90a6367e2c remove mentionings of tabs proposal, fyi@lramos15 2022-04-22 11:51:53 +02:00
Logan Ramos aa69f3d762 Fix #15178 Finalize tabs API 🎉 2022-04-21 11:08:12 -04:00
Benjamin Pasero 44b6695d4e timeline - add setting to bring back "Uncommitted Changes" (#147372) 2022-04-13 17:10:28 +02:00
Ladislau Szomoru 0e5a8e4bc0 Git - Disable automatic repository scanning in the root of the HOMEDRIVE (#339) 
* Disable automatic repository scanning in the root of the HOMEDRIVE

* Fix condition

* Pull request feedback
 2022-04-12 11:03:24 -07:00
Ladislau Szomoru aa0cc06377 Adopt RelativePattern to watch the repository root 2022-04-11 12:13:47 +02:00
Ladislau Szomoru 404fe73c20 Enable more logging during repository discovery 2022-04-08 16:59:56 +02:00
Ladislau Szomoru a2f6254739 💄 Remove console.log 2022-04-07 16:39:20 +02:00
Ladislau Szomoru cb1851d2dc Second attempt to fix #121914 2022-04-07 16:38:01 +02:00
Ladislau Szomoru ef6f0ec6ab Manually porting change from PR #127702 2022-04-07 15:33:12 +02:00
Ladislau Szomoru 0b270f9e22 Fix #146909 2022-04-06 14:36:13 +02:00
Logan Ramos d52eeec75d Update variable misname 2022-04-05 15:15:41 -04:00
heartacker 80f8b99e3c add the git.fetch action to the frist header menu in scm in order to be easier to fetch the repo immediately (#137940) 2022-04-05 15:32:32 +02:00
Benjamin Pasero e8f26b998e git - use same icon for comparing as core diff editor 
//cc @lszomoru
 2022-04-01 17:20:31 +02:00
Ladislau Szomoru 9f7eaad160 Additional logging for git commands 2022-03-30 12:15:20 +02:00
hello-smile6 45744133c3 Update package.json (#146278) 
Fixes #146093
 2022-03-30 09:35:56 +02:00
Ladislau SzomoruandMarkus Korn 29f9e51444 if 'git.untrackedChanges' is set to 'hidden' ignore untracked files when running 'git status' 
Co-authored-by: Markus Korn <markus.korn@gmail.com>
 2022-03-29 21:22:30 +02:00
SteVen Batten 88632df6c9 update git: reveal in side bar 
refs #145765
 2022-03-23 16:47:43 -07:00
Benjamin Pasero 7de40ebc0b remove uncommited changes (#145853) 2022-03-23 09:26:17 +01:00
Johannes 0f648cd7db add eslint rule to disallow look behind regex feature, ignore in git and markdown fyi @lszomoru, @mjbvz 2022-03-22 16:02:19 +01:00
Ladislau Szomoru c6a623c185 Fix #144671 2022-03-22 13:35:16 +01:00
Logan Ramos a2d8edb83d Tabs API renaming 2022-03-21 13:35:34 -04:00
Ladislau Szomoru cfb685861a Fix ESLint error 2022-03-21 16:45:56 +01:00
Backfighter b8a5e18171 Allow disabling integrated askpass (#115455) 
The GIT_ASKPASS variable is currently enforced by vscode and there is no way to overwrite it.
This commit adds an options to disable the integrated askpass and use
your own.

Fixes #111839
 2022-03-21 16:31:04 +01:00