Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-27 21:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
104,433 Commits 3,081 Branches 347 Tags
c4cfcf781b60decac080c05f2fd0b2f855fddbb7
Commit Graph

333 Commits

Author SHA1 Message Date
Ladislau Szomoru
1542e90126 Git - Add command to delete remote tags (#170415) 
Add command to delete remote tags
 2023-01-03 06:08:48 -08:00
Ladislau Szomoru
2c8b54bbbf Git - Add support for git stash --staged (#169539) 
Add support for git stash --staged
 2022-12-19 15:04:55 +01:00
Mikl Wolfe
73221ee046 Update git config.followTagsWhenSync definition (#155914) 2022-12-06 15:03:22 +01:00
Ladislau Szomoru
55d6b17e19 Git - Update unsafe repositories link (#167832) 
Update unsafe repositories link
 2022-12-01 13:40:05 +01:00
Ladislau Szomoru
d0b47f6c30 Git - Unsafe repositories flow polish (#167728) 2022-11-30 16:39:59 +01:00
Ladislau Szomoru
4934caaf88 Git - improve unsafe repository message based on feedback (#167701) 
Fix #167595
 2022-11-30 10:15:44 +01:00
Ladislau Szomoru
3a52e79cea Git - handle unsafe repositories (#167248) 2022-11-25 14:40:23 +01:00
Greg Van Liew
27a550f451 Settings description edits (#166315) 
* Settings description edits

* Remove unnecessary trailing line returns
 2022-11-14 13:47:54 -08:00
Ladislau Szomoru
b208b8794d Git - Optimistic UI plumbing (#165237) 2022-11-04 04:52:28 -07:00
Ladislau Szomoru
e1e7ce5d17 Git - adopt log output channel api (#163695) 2022-10-17 02:49:12 -07:00
Ladislau Szomoru
8c946e23f4 Git - Fix typo in setting description (#163400) 
Fix typo in setting description
 2022-10-12 09:12:39 +02:00
Ladislau Szomoru
9bc43c7f8a Git - Rename git.fetchBeforeCheckout to git.pullBeforeCheckout (#162303) 
Rename git.fetchBeforeCheckout to git.pullBeforeCheckout
 2022-09-30 00:42:20 -07:00
Henning Dieterichs
46afa5b108 Fixes #162043 by renaming "Accept Merge" to "Complete Merge" (#162361) 2022-09-29 08:19:06 -07:00
Henning Dieterichs
c4359c2dab Addresses #162112 (#162321) 2022-09-29 12:18:18 +02:00
Ladislau Szomoru
e1c7285ab5 Git - Add the ability to fetch a branch before it is checked out (#160181) 2022-09-15 16:04:37 +02:00
Ladislau Szomoru
1e99736c27 Git - Add merge abort command (#159753) 
* Add merge abort command

* Pull request feedback
 2022-09-07 06:06:20 -07:00
Henning Dieterichs
7688a40249 Implements commands to recompute merge with git merge-file 2022-08-28 16:41:13 +02:00
Ladislau Szomoru
3cfc74c52e Git - Add setting to remember post commit command (#158449) 2022-08-22 12:34:47 +02:00
Johannes Rieken
c0ade8bc81 joh/unknown lemming (#158460) 
* make git's `openMergeEditor` user-facing command and show it for editors that have conflicts

also includes a workaround for an issue with untyped editor inputs... fyi @lramos15

* Patch matches

* Remove TODO

* set nowrap for white-space

fixes https://github.com/microsoft/vscode/issues/156402

Co-authored-by: Logan Ramos <lramos15@gmail.com>
 2022-08-18 06:58:30 -04:00
Ladislau Szomoru
ee18db8144 Sync Changes button - only show when local branch is ahead/behind the remote branch (#155192) 
Only show Sync Changes button when local branch is ahead/behind the remote branch
 2022-07-14 13:51:47 +00:00
Ladislau Szomoru
cf532ac7db Git - Tweak the git.useEditorAsCommitInput setting description (#153794) 
* Tweak the setting description

* Update extensions/git/package.nls.json

Co-authored-by: João Moreno <joao.moreno@microsoft.com>

Co-authored-by: João Moreno <joao.moreno@microsoft.com>
 2022-06-30 06:42:23 -07:00
Ladislau Szomoru
8045df1b94 Git - Add commands to the editor title to accept/discard commit message (#153692) 
Add commands to the editor title to accept/discard commit message
 2022-06-29 14:00:09 +00:00
Harald Kirschner
56cade24a3 Make the guided git.missing welcome view default (#149668) 2022-06-29 01:14:39 -07:00
Johannes
aae22c1605 rename setting to git.mergeEditor, no more experimental 2022-06-27 12:54:55 +02:00
Ladislau Szomoru
367eefd5f1 Git - commit action button (#153031) 2022-06-24 16:07:24 +02:00
Ladislau Szomoru
25cc6c0dd0 Git - Remove git.branchProtectionIndicator setting (#153020) 
Remove git.branchProtectionIndicator setting
 2022-06-23 21:56:54 +02:00
Ladislau Szomoru
75362a6268 Git - add settings to control the branch protection indicator (#152469) 
* Add settings to control the branch protection indicator

* Pull request feedback
 2022-06-22 01:02:13 -07:00
Ladislau Szomoru
88731bf6d6 Git - enable using the editor as the git commit input (#152158) 2022-06-16 16:27:35 +02:00
Ladislau Szomoru
6f5fc17622 Git - use editor as commit message input (#151491) 2022-06-08 15:45:27 +02:00
Ladislau Szomoru
59fa71999e Git - branch name generation setting feedback (#151106) 2022-06-02 14:27:06 +00: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
Henning Dieterichs
ac312975c6 Merge branch 'main' into 3wm 
# Conflicts:
#	build/lib/i18n.resources.json
 2022-05-25 18:12:25 +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
Johannes
3aac77dc5d Merge branch 'main' into 3wm 2022-05-16 09:53:59 +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
286333fffb Merge branch 'main' into 3wm 2022-05-11 09:44:08 +02: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
Ladislau Szomoru
ce88518440 Git - logging improvements (#148656) 2022-05-05 12:52:26 +00: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
44b6695d4e timeline - add setting to bring back "Uncommitted Changes" (#147372) 2022-04-13 17:10:28 +02:00
SteVen Batten
88632df6c9 update git: reveal in side bar 
refs #145765
 2022-03-23 16:47:43 -07: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
Ladislau Szomoru
ce46f445c0 Add command to close all diff editors 2022-02-15 11:59:39 +01:00
Ladislau Szomoru
888677ed95 Close stale diff editors while stashing changes 2022-02-14 10:32:59 +01:00
Ladislau Szomoru
088f5b6a3e Git - close diff editors on operation (#142513) 2022-02-09 11:04:06 +01:00
Ladislau Szomoru
e4cce8c6e8 Add setting for git commands to be logged in the git output 2022-02-04 15:36:25 +01:00