Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-01 21:54:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
103,214 Commits 4,958 Branches 386 Tags
cb226f7c7ea7e15fcd852be616cdc8658cc7d995
Commit Graph
705 Commits
Author SHA1 Message Date
Ladislau Szomoru d0b47f6c30 Git - Unsafe repositories flow polish (#167728) 2022-11-30 16:39:59 +01:00
Johannes Rieken e7edf6e9b8 Give an option to show changes (SCM view) when encountering a merge conflict (#167265) 
fixes https://github.com/microsoft/vscode/issues/162037
 2022-11-25 17:54:01 +01:00
Ladislau Szomoru 3a52e79cea Git - handle unsafe repositories (#167248) 2022-11-25 14:40:23 +01:00
Alex Ross 328ed10651 Git drop stash commands should use modal dialog (#166573) 
Since the warning is initiated through user action, and the user is required to interact with the warning to finish their intended action we should use a modal dialog here.
 2022-11-17 12:49:56 +01:00
Ladislau Szomoru b149a6de63 Git - Improve branch publish prompt (#165949) 2022-11-10 15:20:27 +01:00
Ladislau Szomoru b208b8794d Git - Optimistic UI plumbing (#165237) 2022-11-04 04:52:28 -07:00
Ladislau Szomoru f60ff405f4 Git - Add "OK, Don't Ask Again" button to the publish branch prompt (#165487) 
Add "OK, Don't Ask Again" button to the publish branch prompt
 2022-11-04 12:41:17 +01:00
Joyce Er 6199d0e9df Improve file dialog action button (#165417) 
* Improve file dialog action button

* `Location` -> `Destination`
 2022-11-03 13:34:43 -07:00
David Dossett 2da60fd58b Update quick pick placeholders and/or remove titles (#165267) 2022-11-02 15:43:18 -07:00
Henning Dieterichs d27d0c28e2 Implements #164686 2022-10-31 14:54:57 +01:00
Ladislau Szomoru 67b8c25157 Commit Action button polish (#164746) 2022-10-28 15:23:19 +02:00
Ladislau SzomoruandTyler James Leonhardt f09c4124a2 Engineering - adopt l10n for git-base/git/github extesions (#164566) 
Co-authored-by: Tyler James Leonhardt <me@tylerleonhardt.com>
 2022-10-28 11:27:08 +02:00
Ladislau Szomoru 7bd27b4287 Git - getSCMResource() should also look at the merge group (#164450) 
getSCMResource() should also look at the merge group
 2022-10-24 06:27:56 -07:00
Joyce Er 7318c90996 Checkout specific branch during clone operation (#163705) 2022-10-23 20:23:35 +02:00
Ladislau Szomoru c139361a3c Git - catch exceptions while fast-forwarding a branch (#164128) 
Fixes #163685
 2022-10-20 04:30:10 -07:00
Henning Dieterichs f1a27d7b8b Recognize stash merge conflicts (#163680) 2022-10-17 07:42:07 -07:00
Ladislau Szomoru e1e7ce5d17 Git - adopt log output channel api (#163695) 2022-10-17 02:49:12 -07: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
Ladislau Szomoru 197bfd9088 Git - Use modal dialog after cloning a repository (#162306) 
Use modal dialog after cloning a repository
 2022-09-29 01:01:29 -07:00
Henning Dieterichs 40a262dc13 merge editor temp model (#161315) 
Introduces hidden mergeEditor.useWorkingCopy setting,
implements reset when the merge editor opens
 2022-09-21 16:02:50 +02:00
Johannes Rieken 21a2eca3b7 The openMergeEditor command should check the active tab when it is called without an URI (#161072) 
https://github.com/microsoft/vscode/issues/160924
 2022-09-16 11:55:06 +02:00
Joyce Er 6835a98d4a Fix branch checkout after git clone (#160922) 
* Fix branch checkout after git clone

* Add progress notification while checking out ref

* Remove promise chain
 2022-09-15 18:11:29 +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 60fa7bc579 Git - Improve git fetch command for repositories with multiple remotes (#159644) 
* Improve git fetch command for repositories with multiple remotes

* Refactored and cleaned up the implementation

* Pull request feedback
 2022-09-14 11:06:27 +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 9b381c5cd9 Merge pull request #159654 from microsoft/hediet/september 
Hediet/september
 2022-09-05 13:00:40 +02:00
Henning Dieterichs 6a853ed3f3 Introduces mergeEditorMenus proposal & fixes issues from PR. 2022-09-02 09:06:24 +02:00
Joyce Er 8d28ffac6d Allow ref checkout after protocol handler clone (#159481) 2022-08-31 11:06:44 +02: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 c592ef8e18 use "Incoming" and "Current" everywhere (#158478) 
fixes https://github.com/microsoft/vscode/issues/156229
 2022-08-18 14:21:06 +02:00
Johannes RiekenandLogan Ramos 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
Joyce Er e1628628a8 Provide context on which repository is being cloned (#158324) 2022-08-17 00:11:28 +01:00
Ladislau Szomoru b2212a1090 Git - Fix more scenarios where the post commit command setting is not honoured. (#157804) 
* Revert "Commit keyboard shortcut to honor the post commit command setting (#157617)"

This reverts commit fe946068ba.

* Fix more scenarios where the post commit command setting is not honoured.
 2022-08-10 16:12:26 -07:00
Ladislau Szomoru e210bbfea4 Git - fix edge case during rebase (#156410) 
Fix blocking issue while resolving conflicts during rebase
 2022-07-27 12:03:47 +03:00
易良 fbdc848c29 fix: typos (#155310) 
* fix: typos

* chore: revert formatting changes

* fix: Remove redundant blank lines
 2022-07-25 15:41:30 -07:00
Ladislau Szomoru ace330ba2c SCM - Fixed a regression due to which post-commit commands were not being executed (#155824) 
Fixed a regression due to which post-commit commands were not being executed
 2022-07-21 12:25:15 +02:00
Ladislau Szomoru cd90b2b5ad Git - Add telemetry comments (#155811) 
Add telemetry comments
 2022-07-21 09:34:19 +02:00
Johannes Rieken ce5d92e998 use commit-icon for description, tweak codicon font-size (#155714) 
https://github.com/microsoft/vscode/issues/150863
 2022-07-20 13:49:24 +02:00
Ladislau Szomoru 03c16c9c00 Git - The git.sync command should use the git.rebaseWhenSync setting (#155511) 
The git.sync command should use the git.rebaseWhenSync setting
 2022-07-18 18:38:58 +02:00
Ladislau Szomoru b3218963c4 Git - Do not show SmartCommit dialog when using "Commit All" (#155486) 
Do not show SmartCommit dialog when using "Commit All"
 2022-07-18 16:55:41 +02:00
Johannes Rieken 8bada27fdd Merge pull request #155148 from microsoft/joh/double-barnacle 
joh/double barnacle
 2022-07-18 16:45:00 +02:00
Johannes Rieken 1878583319 read REBASE_HEAD when rebasing, swap yours/theirs (label, sides) as well (#155208) 
https://github.com/microsoft/vscode/issues/153737
 2022-07-14 09:23:44 -07:00
Johannes 0f0101be5f use TabInputTextMerge in git extensions 
For now only when checking for tabs, not yet for opening tabs
 2022-07-14 09:41:54 +02:00
Ladislau Szomoru f6332bd86d Git - Use cloud icon for remote branches (#155140) 
Use cloud icon for remote branches
 2022-07-14 08:55:29 +02:00
Ladislau Szomoru c7c0acd2ce Git - Commit action button extension api (#154555) 2022-07-12 17:06:16 +02:00
Ladislau Szomoru 1230b7c300 Git - "Commit & Push" command now publishes the branch if there is no tracking remote (#153749) 
"Commit & Push" command now publishes the branch if there is no tracking remote
 2022-06-30 02:12:31 -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
Johannes Rieken 7aec222831 joh/issue150862 (#153677) 
* execute `workbench.view.scm` to reval SCM view after accepting merge

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

* only reveal viewlet when stage/accept was done
 2022-06-29 12:20:49 +00:00