diff --git a/README.md b/README.md index 7f13bd6672f98..87d53052b91f6 100644 --- a/README.md +++ b/README.md @@ -69,15 +69,17 @@ Here are just some of the **features** that GitLens provides, - user-defined [**modes**](#modes- 'Jump to Modes') for quickly toggling between sets of settings - and so much more 😁 -# GitLens+ [#](#gitlens+- 'GitLens+') +# GitLens+ Features [#](#gitlens+-features- 'GitLens+ Features') -GitLens+ adds all-new, completely optional, features that enhance your current GitLens experience when you sign in with a free account. [GitLens+ features](https://gitkraken.com/gitlens/plus-features?utm_source=gitlens-extension&utm_medium=in-app-links&utm_campaign=gitlens-plus-links) are free for local and public repos, no account required, while private repos require GitLens Pro. +Powerful, all-new, and completely optional, features that enhance your GitLens experience. -> All other GitLens features are always accessible, without an account, and will continue to evolve and be invested in. +[GitLens+ features](https://gitkraken.com/gitlens/plus-features?utm_source=gitlens-extension&utm_medium=in-app-links&utm_campaign=gitlens-plus-links) are free for local and public repos, no account required, while upgrading to GitLens Pro gives you access on private repos. + +> All other GitLens features are always accessible. ## Does this affect existing features? -No, the introduction of GitLens+ has no impact on existing GitLens features, so you won't lose access to any of the GitLens features you know and love. In fact, we are heavily investing in enhancing and expanding the GitLens feature set. Upgrading to GitLens Pro additionally gives you access to GitLens+ features on private repos. +No, the introduction of GitLens+ features has no impact on existing GitLens features, so you won't lose access to any of the GitLens features you know and love. In fact, we are heavily investing in enhancing and expanding the GitLens feature set. Additionally, GitLens+ features are freely available to everyone for local and public repos, while upgrading to GitLens Pro gives you access on private repos. ## Commit Graph [#](#commit-graph- 'Commit Graph') @@ -85,7 +87,9 @@ No, the introduction of GitLens+ has no impact on existing GitLens features, so Commit Graph

-The _Commit Graph_ helps you to easily visualize branch structure and commit history. Not only does it help you verify your changes, but also easily see changes made by others and when. Selecting a row within the graph will open in-depth information about a commit or stash in the new [Commit Details view](#commit-details-view-). +The _Commit Graph_ helps you easily visualize and keep track of all work in progress. Not only does it help you verify your changes, but also easily see changes made by others and when. Selecting a row within the graph will open in-depth information about a commit or stash in the new [Commit Details view](#commit-details-view-). + +Use the rich commit search to find exactly what your looking for. It's powerful filters allow you to search by a specific commit, message, author, a changed file or files, or even a specific code change. ## Visual File History view [#](#visual-file-history-view- 'Visual File History view') @@ -95,6 +99,8 @@ The _Commit Graph_ helps you to easily visualize branch structure and commit his The _Visual File History_ view allows you to quickly see the evolution of a file, including when changes were made, how large they were, and who made them. +Use it to quickly find when the most impactful changes were made to a file or who best to talk to about file changes, and more. + Authors who have contributed changes to the file are on the left y-axis to create a swim-lane of their commits over time (the x-axis). Commit are plotted as color-coded (per-author) bubbles, whose size represents the relative magnitude of the changes. Additionally, each commit's additions and deletions are visualized as color-coded, stacked, vertical bars, whose height represents the number of affected lines (right y-axis). Added lines are shown in green, while deleted lines are red. @@ -105,7 +111,11 @@ Additionally, each commit's additions and deletions are visualized as color-code Worktrees view

-Worktrees allow you to easily work on different branches of a repository simultaneously. You can create multiple working trees, each of which can be opened in individual windows or all together in a single workspace. +Worktrees help you multitask, by minimizing the context switching between branches, allowing you to easily work on different branches of a repository simultaneously. + +Avoid interrupting your work in progress when needing to review a pull request. Simply create a new worktree and open it in a new VS Code window, all without impacting your other work. + +You can create multiple working trees, each of which can be opened in individual windows or all together in a single workspace. # Features @@ -292,7 +302,7 @@ GitLens adds many side bar views to provide additional rich functionality. The d Commits Details view

-The _Commit Details_ view provides rich details for commits and stashes: author, commit ID, links to Pull Requests and Issues, autolinks, changed files, and more. +The _Commit Details_ view provides rich details for commits and stashes: author, commit ID, autolinks to pull requests and issues, changed files, and more. These will show contextually as you navigate: diff --git a/package.json b/package.json index 134cb30929972..bb48c8512e55e 100644 --- a/package.json +++ b/package.json @@ -12424,8 +12424,8 @@ }, { "id": "gitlens.welcome.plus", - "title": "Introducing GitLens+", - "description": "Check out the all-new, completely optional, GitLens+ features.\n\n[Learn about GitLens+ features](command:gitlens.plus.learn?false \"Open the GitLens+ features walkthrough\")", + "title": "Introducing GitLens+ Features", + "description": "Check out the powerfull, all-new, and completely optional, GitLens+ features.\n\n[Learn about GitLens+ features](command:gitlens.plus.learn?false \"Open the GitLens+ features walkthrough\")", "media": { "markdown": "walkthroughs/getting-started/12-plus.md" } @@ -12434,50 +12434,50 @@ }, { "id": "gitlens.plus", - "title": "Introducing GitLens+", + "title": "Introducing GitLens+ Features", "description": "Get even more out of GitLens in VS Code!", "steps": [ { "id": "gitlens.plus.intro.tryNow", - "title": "Introducing GitLens+", + "title": "Introducing GitLens+ Features", "description": "Try GitLens+ features on private repos, free for 3 days, without an account.\n\n[Start a GitLens Pro Trial](command:gitlens.plus.startPreviewTrial)", "media": { - "markdown": "walkthroughs/plus/1-intro.md" + "markdown": "walkthroughs/plus/intro.md" }, "when": "gitlens:plus:state == 0" }, { "id": "gitlens.plus.intro.trial", - "title": "Introducing GitLens+", + "title": "Introducing GitLens+ Features", "description": "During your GitLens Pro trial, you have additional access to GitLens+ features on private repos.", "media": { - "markdown": "walkthroughs/plus/1-intro.md" + "markdown": "walkthroughs/plus/intro.md" }, "when": "gitlens:plus:state == 1 || gitlens:plus:state == 3" }, { "id": "gitlens.plus.intro.extend", - "title": "Introducing GitLens+", + "title": "Introducing GitLens+ Features", "description": "Do you want to continue to use GitLens+ features on private repos, free for an additional 7-days?\n\n[Extend Trial](command:gitlens.plus.loginOrSignUp)", "media": { - "markdown": "walkthroughs/plus/1-intro.md" + "markdown": "walkthroughs/plus/intro.md" }, "when": "gitlens:plus:state == 2" }, { "id": "gitlens.plus.intro.signIn", - "title": "Introducing GitLens+", + "title": "Introducing GitLens+ Features", "description": "Do you want to continue to use GitLens+ features on private repos?\n\n[Upgrade to Pro](command:gitlens.plus.command:gitlens.plus.purchase)", "media": { - "markdown": "walkthroughs/plus/1-intro.md" + "markdown": "walkthroughs/plus/intro.md" }, "when": "gitlens:plus:state == 4" }, { "id": "gitlens.plus.intro", - "title": "Introducing GitLens+", + "title": "Introducing GitLens+ Features", "media": { - "markdown": "walkthroughs/plus/1-intro.md" + "markdown": "walkthroughs/plus/intro.md" }, "when": "gitlens:plus:state == 5" }, @@ -12494,7 +12494,7 @@ "title": "Visualize file history", "description": "A more visual way to analyze and explore changes made to a file.\n\n[Open Visual File History view](command:gitlens.showTimelineView)", "media": { - "markdown": "walkthroughs/plus/3-visual-file-history.md" + "markdown": "walkthroughs/plus/visual-file-history.md" } }, { @@ -12502,7 +12502,7 @@ "title": "Worktrees", "description": "Create worktrees to have multiple branches checked-out at once on the same repository.\n\n[Open Worktrees view](command:gitlens.showWorktreesView)", "media": { - "markdown": "walkthroughs/plus/2-worktrees.md" + "markdown": "walkthroughs/plus/worktrees.md" } }, { @@ -12517,25 +12517,34 @@ "title": "Try GitLens Pro", "description": "Try GitLens+ features on private repos, free for 3 days, without an account.\n\n[Start a GitLens Pro Trial](command:gitlens.plus.startPreviewTrial)", "media": { - "markdown": "walkthroughs/plus/5-try-now.md" + "markdown": "walkthroughs/plus/try-now.md" }, "when": "gitlens:plus:state == 0" }, { "id": "gitlens.plus.extend", "title": "Extend Your GitLens Pro Trial", - "description": "Sign in for use on public repos and get an additional 7 day trial for private repos.\n\n[Extend Trial](command:gitlens.plus.loginOrSignUp)", + "description": "Extend your trial to get an additional 7-days of GitLens+ features on private repos for free.\n\n[Extend Trial](command:gitlens.plus.loginOrSignUp)", "media": { - "markdown": "walkthroughs/plus/5-try-now.md" + "markdown": "walkthroughs/plus/try-now.md" }, "when": "gitlens:plus:state == 2" }, { - "id": "gitlens.plus.signIn", + "id": "gitlens.plus.purchase", "title": "Upgrade to GitLens Pro", - "description": "Do you want to continue to use GitLens+ features on private repos?\n\n[Upgrade to Pro](command:gitlens.plus.purchase)", + "description": "Want to use GitLens+ features on private repos?\n\n[Upgrade to Pro](command:gitlens.plus.purchase)", "media": { - "markdown": "walkthroughs/plus/5-try-now.md" + "markdown": "walkthroughs/plus/try-now.md" + }, + "when": "gitlens:plus:state == 1 || gitlens:plus:state == 3" + }, + { + "id": "gitlens.plus.expired", + "title": "Upgrade to GitLens Pro", + "description": "Want to continue to use GitLens+ features on private repos?\n\n[Upgrade to Pro](command:gitlens.plus.purchase)", + "media": { + "markdown": "walkthroughs/plus/try-now.md" }, "when": "gitlens:plus:state == 4" } diff --git a/src/webviews/apps/home/components/header-card.ts b/src/webviews/apps/home/components/header-card.ts index a3f08da1e1d06..9629d9d7380cf 100644 --- a/src/webviews/apps/home/components/header-card.ts +++ b/src/webviews/apps/home/components/header-card.ts @@ -6,12 +6,9 @@ import '../../shared/components/codicon'; const template = html`
GitLens Logo
-

- ${when( - x => x.name === '', - html`GitLens 13 Git supercharged`, - )} - ${when(x => x.name !== '', html`${x => x.name}`)} +

+ ${when(x => x.name === '', html`GitLens 13`)} + ${when(x => x.name !== '', html`${x => x.name}`)}

All-new, completely optional, features that enhance your GitLens experience.

+

Powerful, all-new, and completely optional, features that enhance your GitLens experience.

- GitLens+ features are free for local and public repos, no account required, while private repos require - GitLens Pro. + GitLens+ features are free for local and public repos, no account required, while upgrading to GitLens + Pro gives you access on private repos.

Try GitLens Pro for private reposTry GitLens+ features on private repos

@@ -55,7 +55,7 @@ const template = html` You have ${x => x.daysRemaining} left in your GitLens Pro trial. Once your trial ends, you'll continue to have access to GitLens+ features on local and public repos, - while private repos require GitLens Pro. + while upgrading to GitLens Pro gives you access on private repos.

`, )} diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html index 749cb20ce0efe..ce8d867181f96 100644 --- a/src/webviews/apps/home/home.html +++ b/src/webviews/apps/home/home.html @@ -120,7 +120,8 @@ Features

- GitLens is deeply integrated into VS Code's Editors, Toolbars, Status Bar, and Command Palette. + GitLens is deeply integrated into many areas and aspects of VS Code, especially editors and + views.

    @@ -242,7 +243,7 @@ Introducing the Commit Graph The Commit Graph helps you easily visualize and keep track of all work in progress.

    - Use our rich search to find exactly what your looking.It's powerful filters can search by a - specific commit, message, author, a changed file or files, or even a specific code change. + Use the rich commit search to find exactly what your looking for. It's powerful filters allow + you to search by a specific commit, message, author, a changed file or files, or even a specific + code change.

    @@ -285,13 +287,13 @@

    Use it to quickly find when the most impactful changes were made to a file or who best to talk - to about file changes (and more). + to about file changes, and more.

    Introducing Worktrees

    Worktrees - help you multitask quickly by allowing you to easily work on different branches of a repository - simultaneously. + help you multitask, by minimizing the context switching between branches, allowing you to easily + work on different branches of a repository simultaneously.

    - Avoid interrupting your work in progress when needing to checkout a PR. Simply create a worktree - and have both simultaneously. + Avoid interrupting your work in progress when needing to review a pull request. Simply create a + new worktree and open it in a new VS Code window, all without impacting your other work

diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx index 56bff48757b89..fae829614aa9d 100644 --- a/src/webviews/apps/plus/graph/GraphWrapper.tsx +++ b/src/webviews/apps/plus/graph/GraphWrapper.tsx @@ -620,7 +620,7 @@ export function GraphWrapper({ GitLens Pro trial . Once your trial ends, you'll continue to have access to GitLens+ features on local and - public repos, while private repos require GitLens Pro. + public repos, while upgrading to GitLens Pro gives you access on private repos.

); diff --git a/walkthroughs/getting-started/12-plus.md b/walkthroughs/getting-started/12-plus.md index cbe83af83a1b1..e7636e027c872 100644 --- a/walkthroughs/getting-started/12-plus.md +++ b/walkthroughs/getting-started/12-plus.md @@ -1,6 +1,12 @@ ## GitLens+ Features -GitLens+ adds all-new, completely optional, features that enhance your current GitLens experience. These features are free for local and public repos, no account required. +Powerful, all-new, and completely optional, features that enhance your GitLens experience. + +[GitLens+ features](https://gitkraken.com/gitlens/plus-features?utm_source=gitlens-extension&utm_medium=in-app-links&utm_campaign=gitlens-plus-links) are free for local and public repos, no account required, while upgrading to GitLens Pro gives you access on private repos. + +[Learn more about GitLens+ features](https://gitkraken.com/gitlens/plus-features?utm_source=gitlens-extension&utm_medium=in-app-links&utm_campaign=gitlens-plus-links 'Learn more') + +All other GitLens features are always accessible GitLens+ features include the Commit Graph, Visual File History, Worktrees, and more. diff --git a/walkthroughs/plus/1-intro.md b/walkthroughs/plus/1-intro.md deleted file mode 100644 index 6d27f3b7f5c82..0000000000000 --- a/walkthroughs/plus/1-intro.md +++ /dev/null @@ -1,18 +0,0 @@ -## Introducing GitLens+ - -GitLens+ adds all-new, completely optional, features that enhance your current GitLens experience. GitLens+ features are free for local and public repos, no account required, while private repos require GitLens Pro. - -ⓘ All other GitLens features are always accessible, without an account, and will continue to evolve and be invested in. - -[Learn more about GitLens+](https://gitkraken.com/gitlens/plus-features?utm_source=gitlens-extension&utm_medium=in-app-links&utm_campaign=gitlens-plus-links 'Learn more') - -GitLens+ features include the Commit Graph, Visual File History, Worktrees, and more. - -

- Commit Graph Illustration -
New Commit Graph GitLens+ Feature -

- -## Does this affect existing features? - -No, the introduction of GitLens+ has no impact on existing GitLens features, so you won't lose access to any of the GitLens features you know and love. In fact, we are heavily investing in enhancing and expanding the GitLens feature set. Upgrading to GitLens Pro additionally gives you access to GitLens+ features on private repos. diff --git a/walkthroughs/plus/2-worktrees.md b/walkthroughs/plus/2-worktrees.md deleted file mode 100644 index ffc08f150902b..0000000000000 --- a/walkthroughs/plus/2-worktrees.md +++ /dev/null @@ -1,9 +0,0 @@ -## Git Worktrees - -

- Worktrees View -

- -Worktrees make developing on and testing multiple branches easier, by minimizing the context switching between branches. Worktrees allow you to easily work on different branches of a repository simultaneously. You can create multiple working trees, each of which can be opened in individual windows or all together in a single workspace. - -_Note: Worktrees do not yet work with VS Code on the Web._ diff --git a/walkthroughs/plus/commit-graph.md b/walkthroughs/plus/commit-graph.md index b6fcb6c68e712..3fa4fb342d294 100644 --- a/walkthroughs/plus/commit-graph.md +++ b/walkthroughs/plus/commit-graph.md @@ -4,4 +4,6 @@ Commit Graph

-The Commit Graph helps you to easily visualize branch structure and commit history. Not only does it help you verify your changes, but also easily see changes made by others and when. +The Commit Graph helps you easily visualize and keep track of all work in progress. Not only does it help you verify your changes, but also easily see changes made by others and when. + +Use the rich commit search to find exactly what your looking for. It's powerful filters allow you to search by a specific commit, message, author, a changed file or files, or even a specific code change. diff --git a/walkthroughs/plus/intro.md b/walkthroughs/plus/intro.md new file mode 100644 index 0000000000000..983148a8f9412 --- /dev/null +++ b/walkthroughs/plus/intro.md @@ -0,0 +1,20 @@ +## Introducing GitLens+ Features + +Powerful, all-new, and completely optional, features that enhance your current GitLens experience. + +[GitLens+ features](https://gitkraken.com/gitlens/plus-features?utm_source=gitlens-extension&utm_medium=in-app-links&utm_campaign=gitlens-plus-links) are free for local and public repos, no account required, while upgrading to GitLens Pro gives you access on private repos. + +[Learn more about GitLens+ features](https://gitkraken.com/gitlens/plus-features?utm_source=gitlens-extension&utm_medium=in-app-links&utm_campaign=gitlens-plus-links 'Learn more') + +$(info) All other GitLens features are always accessible + +GitLens+ features include the Commit Graph, Visual File History, Worktrees, and more. + +

+ Commit Graph Illustration +
New Commit Graph +

+ +## Does this affect existing features? + +No, the introduction of GitLens+ features has no impact on existing GitLens features, so you won't lose access to any of the GitLens features you know and love. In fact, we are heavily investing in enhancing and expanding the GitLens feature set. Additionally, GitLens+ features are freely available to everyone for local and public repos, while upgrading to GitLens Pro gives you access on private repos. diff --git a/walkthroughs/plus/5-try-now.md b/walkthroughs/plus/try-now.md similarity index 100% rename from walkthroughs/plus/5-try-now.md rename to walkthroughs/plus/try-now.md diff --git a/walkthroughs/plus/3-visual-file-history.md b/walkthroughs/plus/visual-file-history.md similarity index 85% rename from walkthroughs/plus/3-visual-file-history.md rename to walkthroughs/plus/visual-file-history.md index d37917a7b7f1c..11b6586793e55 100644 --- a/walkthroughs/plus/3-visual-file-history.md +++ b/walkthroughs/plus/visual-file-history.md @@ -6,6 +6,8 @@ The Visual File History allows you to quickly see the evolution of a file, including when changes were made, how large they were, and who made them. +Use it to quickly find when the most impactful changes were made to a file or who best to talk to about file changes, and more. + Authors who have contributed changes to the file are on the left y-axis to create a swim-lane of their commits over time (the x-axis). Commit are plotted as color-coded (per-author) bubbles, whose size represents the relative magnitude of the changes. Additionally, each commit's additions and deletions are visualized as color-coded, stacked, vertical bars, whose height represents the number of affected lines (right y-axis). Added lines are shown in green, while deleted lines are red. diff --git a/walkthroughs/plus/worktrees.md b/walkthroughs/plus/worktrees.md new file mode 100644 index 0000000000000..738551188923d --- /dev/null +++ b/walkthroughs/plus/worktrees.md @@ -0,0 +1,13 @@ +## Git Worktrees + +

+ Worktrees View +

+ +Worktrees help you multitask, by minimizing the context switching between branches, allowing you to easily work on different branches of a repository simultaneously. + +Avoid interrupting your work in progress when needing to review a pull request. Simply create a new worktree and open it in a new VS Code window, all without impacting your other work. + +You can create multiple working trees, each of which can be opened in individual windows or all together in a single workspace. + +_Note: Worktrees do not yet work with VS Code on the Web._