Skip to content

Commit 305ce41

Browse files
Merge branch 'main' into README-update-feature-sections
2 parents 288aa8d + db4e98d commit 305ce41

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1425
-1654
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Install GitLens by clicking `Install` on the banner above, or from the Extension
1818

1919
> Have questions or concerns? Talk to our engineering team directly through our [GitHub Discussions](https://github.com/gitkraken/vscode-gitlens/discussions/categories/feedback) page. Having a positive experience with GitLens? Feel free to [write a review](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens&ssr=false#review-details).
2020
21+
2122
## GitLens Editions: Free and Pro
2223

2324
**GitLens Free** gives you powerful tools to manage Git and understand how your code has evolved and by whom. With popular features like in-editor blame annotations, hovers, and CodeLens, you can see actionable authorship details at the top of each file. Track the history of any file over time using Revision Navigation to gain deeper insights into code changes.
@@ -28,8 +29,7 @@ Install GitLens by clicking `Install` on the banner above, or from the Extension
2829
- **Manage commits effortlessly** using the Commit Graph, where you can execute advanced actions like rebase, merge, and more. With powerful search and filtering, quickly locate commits, branches, or files.
2930
- **Enhance collaboration** by integrating with platforms like GitHub, GitLab, and Bitbucket, reducing context switching. View and manage PRs directly in VS Code through Launchpad.
3031

31-
You can [try GitLens Pro for free](https://gitkraken.dev/register?product=gitlens&source=marketing_page&redirect_uri=vscode%3A%2F%2Feamodio.gitlens%2Flogin&flow=gitlens_web) by signing up for a GitKraken account. Some Pro features are available for free on public repos. `Preview` features may require a GitKraken account and could become Pro features in the future.
32-
32+
You can [try GitLens Pro for free](https://gitkraken.dev/register?product=gitlens&source=marketing_page&redirect_uri=vscode%3A%2F%2Feamodio.gitlens%2Flogin&flow=gitlens_web) by signing up for a GitKraken account. Some Pro features are available for free on public repos. `Preview` features may require a GitKraken account and could become Pro features in the future.
3333

3434
[Workflows](#discover-powerful-workflows 'Jump to Discover Powerful Workflows')
3535
| [More Features](#more-features 'Jump to More Features')

ThirdPartyNotices.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ This project incorporates components from the projects listed below.
1212
7. @octokit/request version 9.1.3 (https://github.com/octokit/request.js)
1313
8. @octokit/types version 13.6.1 (https://github.com/octokit/types.ts)
1414
9. @opentelemetry/api version 1.9.0 (https://github.com/open-telemetry/opentelemetry-js)
15-
10. @opentelemetry/exporter-trace-otlp-http version 0.53.0 (https://github.com/open-telemetry/opentelemetry-js)
16-
11. @opentelemetry/resources version 1.26.0 (https://github.com/open-telemetry/opentelemetry-js)
17-
12. @opentelemetry/sdk-trace-base version 1.26.0 (https://github.com/open-telemetry/opentelemetry-js)
15+
10. @opentelemetry/exporter-trace-otlp-http version 0.54.0 (https://github.com/open-telemetry/opentelemetry-js)
16+
11. @opentelemetry/resources version 1.27.0 (https://github.com/open-telemetry/opentelemetry-js)
17+
12. @opentelemetry/sdk-trace-base version 1.27.0 (https://github.com/open-telemetry/opentelemetry-js)
1818
13. @opentelemetry/semantic-conventions version 1.27.0 (https://github.com/open-telemetry/opentelemetry-js)
19-
14. @shoelace-style/shoelace version 2.17.1 (https://github.com/shoelace-style/shoelace)
19+
14. @shoelace-style/shoelace version 2.18.0 (https://github.com/shoelace-style/shoelace)
2020
15. @vscode/codicons version 0.0.36 (https://github.com/microsoft/vscode-codicons)
2121
16. ansi-regex version 6.1.0 (https://github.com/chalk/ansi-regex)
22-
17. billboard.js version 3.13.0 (https://github.com/naver/billboard.js)
22+
17. billboard.js version 3.14.0 (https://github.com/naver/billboard.js)
2323
18. https-proxy-agent version 5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent)
2424
19. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite)
2525
20. lit version 3.2.1 (https://github.com/lit/lit)
26-
21. marked version 14.1.2 (https://github.com/markedjs/marked)
26+
21. marked version 14.1.3 (https://github.com/markedjs/marked)
2727
22. microsoft/vscode (https://github.com/microsoft/vscode)
2828
23. node-fetch version 2.7.0 (https://github.com/bitinn/node-fetch)
2929
24. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify)

docs/links.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,18 @@ _{prefix}/command/{command}_
270270

271271
- _{command}_ is the name of the command to run. Currently supported values include:
272272

273+
- _cloud-patches_ - Runs the `GitLens: Show Cloud Patches View` command.
274+
275+
- _graph_ - Runs the `GitLens: Show Graph` command.
276+
277+
- _inspect_ - Runs the `GitLens: Inspect Commit Details` command.
278+
273279
- _launchpad_ - Runs the `GitLens: Show Launchpad` command.
274280

275281
- _walkthrough_ - Runs the `GitLens: Get Started` command.
276282

283+
- _worktrees_ - Runs the `GitLens: Show Worktrees View` command.
284+
277285
#### Example Usage
278286

279287
External sources, such as GitKraken web pages, can use these links to directly run a GitLens command - for example, to show the Launchpad.

images/icons/play-button.svg

Lines changed: 1 addition & 0 deletions
Loading

images/icons/rocket-filled.svg

Lines changed: 1 addition & 0 deletions
Loading

images/icons/template/mapping.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,7 @@
5151
"repo-fetch": 61744,
5252
"repo-pull": 61745,
5353
"repo-push": 61746,
54-
"provider-jira": 61747
54+
"provider-jira": 61747,
55+
"play-button": 61748,
56+
"rocket-filled": 61749
5557
}

0 commit comments

Comments
 (0)