diff --git a/README.md b/README.md index 9826dc2..0e4b01c 100644 --- a/README.md +++ b/README.md @@ -68,13 +68,13 @@ GitLens provides an unobtrusive blame annotation at the end of the selected line - Adds a `Compare File with Next Commit` command (`gitlens.diffWithNext`) with a shortcut of `alt+.` to compare the active file/diff with the next commit revision -- Adds a `Compare File with Previous Commit` command (`gitlens.diffWithPrevious`) with a shortcut of `alt+,` to compare the active file/diff with the previous commit revision +- Adds a `Compare File with Previous` command (`gitlens.diffWithPrevious`) with a shortcut of `alt+,` to compare the active file/diff with the previous commit revision -- Adds a `Compare Line with Previous Commit` command (`gitlens.diffLineWithPrevious`) with a shortcut of `shift+alt+,` to compare the active file/diff with the previous line commit revision +- Adds a `Compare Line Commit with Previous` command (`gitlens.diffLineWithPrevious`) with a shortcut of `shift+alt+,` to compare the active file/diff with the previous line commit revision - Adds a `Compare File with Working Tree` command (`gitlens.diffWithWorking`) with a shortcut of `shift+alt+w` to compare the most recent commit revision of the active file/diff with the working tree -- Adds a `Compare Line with Working Tree` command (`gitlens.diffLineWithWorking`) with a shortcut of `alt+w` to compare the commit revision of the active line with the working tree +- Adds a `Compare Line Commit with Working Tree` command (`gitlens.diffLineWithWorking`) with a shortcut of `alt+w` to compare the commit revision of the active line with the working tree #### Navigate and Explore @@ -120,7 +120,7 @@ GitLens provides an unobtrusive blame annotation at the end of the selected line ![Line Commit Details Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-git-codelens/master/images/screenshot-commit-file-details.png) - - Provides entries to `Show Commit Details`, `Show File History`, `Compare with...`, `Copy to Clipboard`, `Open File`, `Open File in ` when available, and more + - Provides entries to `Show Commit Details`, `Show File History`, `Compare File with...`, `Copy to Clipboard`, `Open File`, `Open File in ` when available, and more - Navigate back to the previous quick pick menu via `alt+left arrow`, if available - Use the `alt+right arrow` shortcut on an entry to execute it without closing the quick pick menu, if possible — commands that open windows outside of VS Code will still close the quick pick menu unless [`"gitlens.advanced.quickPick.closeOnFocusOut": false`](#extension-settings) is set diff --git a/package.json b/package.json index a2cd766..4b822a1 100644 --- a/package.json +++ b/package.json @@ -386,12 +386,12 @@ }, { "command": "gitlens.diffWithPrevious", - "title": "Compare File with Previous Commit", + "title": "Compare File with Previous", "category": "GitLens" }, { "command": "gitlens.diffLineWithPrevious", - "title": "Compare Line with Previous Commit", + "title": "Compare Line Commit with Previous", "category": "GitLens" }, { @@ -401,7 +401,7 @@ }, { "command": "gitlens.diffLineWithWorking", - "title": "Compare Line with Working Tree", + "title": "Compare Line Commit with Working Tree", "category": "GitLens" }, { diff --git a/src/quickPicks/commitFileDetails.ts b/src/quickPicks/commitFileDetails.ts index d712b62..03454f6 100644 --- a/src/quickPicks/commitFileDetails.ts +++ b/src/quickPicks/commitFileDetails.ts @@ -72,7 +72,7 @@ export class CommitFileDetailsQuickPick { if (commit.previousSha) { items.push(new CommandQuickPickItem({ - label: `$(git-compare) Compare with Previous Commit`, + label: `$(git-compare) Compare File with Previous`, description: `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.previousShortSha} \u00a0 $(git-compare) \u00a0 $(git-commit) ${commit.shortSha}` }, Commands.DiffWithPrevious, [ commit.uri, @@ -85,7 +85,7 @@ export class CommitFileDetailsQuickPick { if (commit.workingFileName) { items.push(new CommandQuickPickItem({ - label: `$(git-compare) Compare with Working Tree`, + label: `$(git-compare) Compare File with Working Tree`, description: `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.shortSha} \u00a0 $(git-compare) \u00a0 $(file-text) ${workingName}` }, Commands.DiffWithWorking, [ Uri.file(path.resolve(commit.repoPath, commit.workingFileName)),