ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-07 09:45:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Renames Diff commands for better clarity

Browse Source 
Removes `Git` from the commands as it feels unnecessary
Reorders the context menu commands
Adds `Diff Commit with Working Tree` to the explorer context menu (assuming `gitlens.menus.fileDiff.enabled` is `true`)
Adds `Diff Commit with Working Tree` & `Diff Commit with Previous` to the editor title context menu (assuming `gitlens.menus.fileDiff.enabled` is `true`)
This commit is contained in:
Eric Amodio
2016-12-07 02:47:27 -05:00
parent 72ef5e2902
commit 4e65eb6344
2 changed files with 58 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -1,6 +1,14 @@
--- ---
## Release Notes ## Release Notes
### 1.3.1
- Renames `Diff` commands for better clarity
- Removes `Git` from the commands as it feels unnecessary
- Reorders the context menu commands
- Adds `Diff Commit with Working Tree` to the explorer context menu (assuming `gitlens.menus.fileDiff.enabled` is `true`)
- Adds `Diff Commit with Working Tree` & `Diff Commit with Previous` to the editor title context menu (assuming `gitlens.menus.fileDiff.enabled` is `true`)
### 1.3.0 ### 1.3.0
- Adds support for blame and history (log) on files opened via compare commands -- allows for deep navigation through git history - Adds support for blame and history (log) on files opened via compare commands -- allows for deep navigation through git history

86
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "gitlens", "name": "gitlens",
"version": "1.3.0", "version": "1.3.1",
"author": { "author": {
"name": "Eric Amodio", "name": "Eric Amodio",
"email": "eamodio@gmail.com" "email": "eamodio@gmail.com"
@@ -246,32 +246,32 @@
"commands": [ "commands": [
{ {
"command": "gitlens.diffWithPrevious", "command": "gitlens.diffWithPrevious",
"title": "Diff with Previous Commit", "title": "Diff Commit with Previous",
"category": "GitLens" "category": "GitLens"
}, },
{ {
"command": "gitlens.diffLineWithPrevious", "command": "gitlens.diffLineWithPrevious",
"title": "Diff with Previous Commit (line)", "title": "Diff Commit (line) with Previous",
"category": "GitLens" "category": "GitLens"
}, },
{ {
"command": "gitlens.diffWithWorking", "command": "gitlens.diffWithWorking",
"title": "Diff with Working Tree", "title": "Diff Commit with Working Tree",
"category": "GitLens" "category": "GitLens"
}, },
{ {
"command": "gitlens.diffLineWithWorking", "command": "gitlens.diffLineWithWorking",
"title": "Diff with Working Tree (line)", "title": "Diff Commit (line) with Working Tree",
"category": "GitLens" "category": "GitLens"
}, },
{ {
"command": "gitlens.showBlame", "command": "gitlens.showBlame",
"title": "Show Git Blame Annotations", "title": "Show Blame Annotations",
"category": "GitLens" "category": "GitLens"
}, },
{ {
"command": "gitlens.toggleBlame", "command": "gitlens.toggleBlame",
"title": "Toggle Git Blame Annotations", "title": "Toggle Blame Annotations",
"category": "GitLens" "category": "GitLens"
}, },
{ {
@@ -281,7 +281,7 @@
}, },
{ {
"command": "gitlens.showBlameHistory", "command": "gitlens.showBlameHistory",
"title": "Open Git Blame History Explorer", "title": "Open Blame History Explorer",
"category": "GitLens" "category": "GitLens"
}, },
{ {
@@ -303,61 +303,75 @@
"menus": { "menus": {
"explorer/context": [ "explorer/context": [
{ {
"command": "gitlens.showQuickFileHistory", "command": "gitlens.diffWithWorking",
"when": "config.git.enabled", "when": "config.gitlens.menus.fileDiff.enabled && config.git.enabled",
"group": "2_gitlens-file@1.0" "group": "2_gitlens-file"
}, },
{ {
"command": "gitlens.diffWithPrevious", "command": "gitlens.diffWithPrevious",
"alt": "gitlens.diffWithWorking",
"when": "config.gitlens.menus.fileDiff.enabled && config.git.enabled", "when": "config.gitlens.menus.fileDiff.enabled && config.git.enabled",
"group": "2_gitlens-file@1.1" "group": "2_gitlens-file"
},
{
"command": "gitlens.showQuickFileHistory",
"when": "config.git.enabled",
"group": "3_gitlens-file"
} }
], ],
"editor/title": [ "editor/title": [
{ {
"command": "gitlens.toggleBlame", "command": "gitlens.diffWithWorking",
"when": "editorTextFocus && config.git.enabled", "when": "config.gitlens.menus.fileDiff.enabled && config.git.enabled",
"group": "2_gitlens"
},
{
"command": "gitlens.diffWithPrevious",
"when": "config.gitlens.menus.fileDiff.enabled && config.git.enabled",
"group": "2_gitlens" "group": "2_gitlens"
}, },
{ {
"command": "gitlens.showQuickFileHistory", "command": "gitlens.showQuickFileHistory",
"when": "editorTextFocus && config.git.enabled", "when": "editorTextFocus && config.git.enabled",
"group": "3_gitlens" "group": "3_gitlens"
},
{
"command": "gitlens.toggleBlame",
"when": "editorTextFocus && config.git.enabled",
"group": "3_gitlens"
} }
], ],
"editor/context": [ "editor/context": [
{ {
"command": "gitlens.toggleBlame", "command": "gitlens.diffWithWorking",
"when": "editorTextFocus && config.git.enabled", "alt": "gitlens.diffLineWithWorking",
"group": "2_gitlens" "when": "editorTextFocus && config.gitlens.menus.fileDiff.enabled && config.git.enabled",
}, "group": "2_gitlens@1.0"
{
"command": "gitlens.showQuickFileHistory",
"when": "config.git.enabled",
"group": "3_gitlens@1.0"
}, },
{ {
"command": "gitlens.diffLineWithWorking", "command": "gitlens.diffLineWithWorking",
"when": "editorTextFocus && config.gitlens.menus.lineDiff.enabled && config.git.enabled", "when": "editorTextFocus && config.gitlens.menus.lineDiff.enabled && config.git.enabled",
"group": "3_gitlens@1.1" "group": "2_gitlens@1.1"
},
{
"command": "gitlens.diffLineWithPrevious",
"when": "editorTextFocus && config.gitlens.menus.lineDiff.enabled && config.git.enabled",
"group": "3_gitlens@1.2"
},
{
"command": "gitlens.diffWithWorking",
"alt": "gitlens.diffLineWithWorking",
"when": "editorTextFocus && config.gitlens.menus.fileDiff.enabled && config.git.enabled",
"group": "3_gitlens@1.3"
}, },
{ {
"command": "gitlens.diffWithPrevious", "command": "gitlens.diffWithPrevious",
"alt": "gitlens.diffLineWithPrevious", "alt": "gitlens.diffLineWithPrevious",
"when": "editorTextFocus && config.gitlens.menus.fileDiff.enabled && config.git.enabled", "when": "editorTextFocus && config.gitlens.menus.fileDiff.enabled && config.git.enabled",
"group": "3_gitlens@1.4" "group": "2_gitlens@1.2"
},
{
"command": "gitlens.diffLineWithPrevious",
"when": "editorTextFocus && config.gitlens.menus.lineDiff.enabled && config.git.enabled",
"group": "2_gitlens@1.3"
},
{
"command": "gitlens.showQuickFileHistory",
"when": "config.git.enabled",
"group": "3_gitlens"
},
{
"command": "gitlens.toggleBlame",
"when": "editorTextFocus && config.git.enabled",
"group": "3_gitlens"
} }
] ]
}, },