5d18f94bb0
Git - Maintain spaces in the arguments ( #154685 )
...
Maintain spaces in the arguments
2022-07-11 02:28:57 -07:00
eb2e5d8558
Git - Commit action button should use smart commit settings ( #154169 )
...
Consider smart commit settings when rendering the commit action button
2022-07-07 21:31:10 +02:00
57609a19da
Git - Update commit button icon and tooltip based on branch protection ( #154101 )
...
Update commit button icon and tooltip based on branch protection
2022-07-04 20:18:16 +02:00
32406a7157
Debt - Prevent icon translations ( #154094 )
...
Prevent icon translations
2022-07-04 14:37:52 +00:00
2fcd34a41b
Fixes #148568 ( #154008 )
...
fixes #148568
2022-07-04 07:41:54 +02:00
53c752ac8a
Git - Disable commit button while merge is in progress ( #153890 )
...
Disable commit button while merge is in progress
2022-07-01 02:56:29 -07:00
b18f9e0630
Git - Do not show Sync Changes and Publish Branch action button when commit is in progress ( #153821 )
...
Do not show Sync Changes and Publish Branch action button when commit is in progress
2022-06-30 07:27:42 -07:00
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
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
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
bd24f72d42
fix 153492 ( #153667 )
...
* enable "accept merge" for merge editor only
* close merge editor before staging file, only stage file when editor has been closed
fixes https://github.com/microsoft/vscode/issues/153492
2022-06-29 14:08:09 +02:00
a424998dfd
Git - Action button precedence ( #153662 )
2022-06-29 12:48:22 +02:00
e773c97507
Git - commit action button does not appear on the initial commit ( #153605 )
...
Fix #153507
2022-06-28 14:07:16 -07:00
adecb6b529
Git - fix secondary action localization ( #153604 )
...
Fix #153503
2022-06-28 20:46:03 +00:00
75b3fd5253
Git - Remove icons from branch picker to address regression ( #153433 )
...
* Remove icons from branch picker to address regression
* Fix create branch from issue
* Pull request feedback
2022-06-28 14:12:08 +02:00
aae22c1605
rename setting to git.mergeEditor, no more experimental
2022-06-27 12:54:55 +02:00
45427b2346
Git - Add icons to branch picker ( #153149 )
...
Add icons to branch picker
2022-06-24 15:46:51 -04:00
367eefd5f1
Git - commit action button ( #153031 )
2022-06-24 16:07:24 +02:00
25cc6c0dd0
Git - Remove git.branchProtectionIndicator setting ( #153020 )
...
Remove git.branchProtectionIndicator setting
2022-06-23 21:56:54 +02:00
a2eccb109e
Merge pull request #152865 from microsoft/3wm
2022-06-23 17:35:24 +02:00
1513f91ac2
Git - fix regression with creating an empty commit ( #152974 )
2022-06-23 16:06:06 +02:00
b9484e8e16
SCM - Action button localization fix ( #152903 )
...
* Localization fix
* Fix typo in key
2022-06-22 19:27:27 +00:00
08a46984d6
SCM - Add capability to disable the SCM action button ( #152849 )
...
Add capability to disable the SCM action button
2022-06-22 13:01:20 +02:00
b673b4274d
Some 3wm cleanup.
2022-06-22 11:49:09 +02:00
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
467eef9270
Sets titles to yours and theirs in the git extension & swaps order. Fixes #150853
2022-06-21 17:23:21 +02:00
88731bf6d6
Git - enable using the editor as the git commit input ( #152158 )
2022-06-16 16:27:35 +02:00
46d9d7acda
Git - branch protection ( #152218 )
...
Co-authored-by: João Moreno <joao.moreno@microsoft.com >
2022-06-16 16:25:03 +02:00
f17b33faf2
Use .?method() in more places ( #152112 )
...
Switches simple patterns like:
```ts
if (some.thing) {
some.thing.method();
}
```
to:
```ts
some.thing?.method()
```
This is more concise and avoids having to repeat the `some.thing` part
2022-06-15 16:28:31 +00:00
c5318659ec
Git - add support for SSH Uri ( #152051 )
...
* Add support for SSH Uri
* Update extensions/git/src/protocolHandler.ts
Co-authored-by: João Moreno <joao.moreno@microsoft.com >
Co-authored-by: João Moreno <joao.moreno@microsoft.com >
2022-06-14 20:41:54 +02:00
5bf63b6e37
Git - fix close all diff editors command ( #152059 )
...
Fix #150315
2022-06-14 13:21:43 +00:00
ed9ed45794
Merge branch 'main' into joh/voluminous-lobster
2022-06-10 09:07:30 +02:00
f7e12a3a92
Use optional method calls in more places ( #151634 )
...
This replaces code like:
```ts
if (foo.bar) {
foo.bar(cat);
}
```
with:
```ts
foo.bar?.(cat)
```
Which is more concise but has the same meaning
2022-06-09 15:04:28 -07:00
43c31079ee
manual fixing of prefer-const violations
2022-06-09 10:19:56 +02:00
3622010b64
Merge branch 'main' into joh/voluminous-lobster
2022-06-09 09:08:20 +02:00
0656d21d11
auto-fixed prefer-const violation
2022-06-08 17:49:21 +02:00
6f5fc17622
Git - use editor as commit message input ( #151491 )
2022-06-08 15:45:27 +02:00
4bd12af7f6
Git log level polish ( #151095 )
2022-06-02 09:10:18 -04:00
3c6fdedd0e
Quick spelling update ( #150759 )
...
https://github.com/Sertion/vscode-gitblame/pull/123
2022-05-31 21:06:38 +00:00
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
149e2b7674
Fix #149831 ( #150276 )
2022-05-25 20:51:08 +02:00
ac312975c6
Merge branch 'main' into 3wm
...
# Conflicts:
# build/lib/i18n.resources.json
2022-05-25 18:12:25 +02:00
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
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
38931b6a3d
add git.experimental.mergeEditor setting to enable/disable merge editor for conflicting files
2022-05-25 17:08:15 +02:00
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
3e83fa95b0
Fix #150266 ( #150267 )
2022-05-24 15:06:34 +02:00
7a51178618
git should open merge editor with detail and description (tag and commit-hash)
2022-05-17 13:46:42 +02:00
3aac77dc5d
Merge branch 'main' into 3wm
2022-05-16 09:53:59 +02:00
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
João Moreno
Johannes Rieken
Henning Dieterichs
Henning Dieterichs
Matt Bierner
Solomon Kinard
Jonas Dellinger
Logan Ramos