Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-03-02 23:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
100,456 Commits 3,089 Branches 347 Tags
eff6fa7696ded98ff145744554d94de44365f209
Commit Graph

1988 Commits

Author SHA1 Message Date
Ladislau Szomoru
5f823f0deb Git - Add minItems/maxItems for branch dictionary setting (#151132) 
Add minItems/maxItems for branch dictionary setting
 2022-06-02 16:48:25 +00:00
Ladislau Szomoru
59fa71999e Git - branch name generation setting feedback (#151106) 2022-06-02 14:27:06 +00:00
Ladislau Szomoru
4bd12af7f6 Git log level polish (#151095) 2022-06-02 09:10:18 -04:00
Matt Bierner
e44f4ba886 Add experimental tag to experimental extension settings (#151031) 
This makes a few more extension settings with the `experimental` tag so that show up if you search `@tag:experimental`
 2022-06-01 16:32:58 -07:00
Ladislau Szomoru
185d3ee2a1 Fix #150725 (#150956) 2022-06-01 11:36:22 +02:00
Solomon Kinard
3c6fdedd0e Quick spelling update (#150759) 
https://github.com/Sertion/vscode-gitblame/pull/123
 2022-05-31 21:06:38 +00:00
David Dossett
903f9903f4 Fix #150595 (#150880) 2022-05-31 10:22:49 -07:00
Ladislau Szomoru
9bfd3c1d72 Revert "A full editor can be used as git commit message editor (#95266)" (#150487) 
This reverts commit 97f8e66d74.
 2022-05-26 14:06:23 -07:00
Ladislau Szomoru
149e2b7674 Fix #149831 (#150276) 2022-05-25 20:51:08 +02:00
Henning Dieterichs
ac312975c6 Merge branch 'main' into 3wm 
# Conflicts:
#	build/lib/i18n.resources.json
 2022-05-25 18:12:25 +02:00
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 Dellinger
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 Szomoru
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 Er
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 Moreno
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