diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c495f1..a0672c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Adds `gitlens.hovers.avatars` setting to specify whether to show avatar images in hovers — closes [#432](https://github.com/eamodio/vscode-gitlens/issues/432) thanks to [PR #441](https://github.com/eamodio/vscode-gitlens/pull/441) by Segev Finer ([@segevfiner](https://github.com/segevfiner))
- Adds `gitlens.hovers.avatars` setting to the interactive settings editor to specify whether to show avatar images in hovers
+### Changed
+- Renames the *GitLens History* explorer to *GitLens File History* explorer for better clarity
+
### Fixed
- Fixes [#436](https://github.com/eamodio/vscode-gitlens/issues/436) - Copy to clipboard not working
@@ -73,9 +76,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
## [8.3.1] - 2018-05-18
### Added
-- Adds the ability to control where the *GitLens*, *GitLens History*, and *GitLens Results* explorers are shown 🎉 — closes [#213](https://github.com/eamodio/vscode-gitlens/issues/213), [#377](https://github.com/eamodio/vscode-gitlens/issues/377)
+- Adds the ability to control where the *GitLens*, *GitLens File History*, and *GitLens Results* explorers are shown 🎉 — closes [#213](https://github.com/eamodio/vscode-gitlens/issues/213), [#377](https://github.com/eamodio/vscode-gitlens/issues/377)
- Adds `gitlens.gitExplorer.location` setting to the interactive settings editor to specify where the *GitLens* explorer is shown — either in the *Explorer* or *Source Control* view
- - Adds `gitlens.historyExplorer.location` setting to the interactive settings editor to specify where the *GitLens History* explorer is shown — either in the *Explorer* or *Source Control* view
+ - Adds `gitlens.historyExplorer.location` setting to the interactive settings editor to specify where the *GitLens File History* explorer is shown — either in the *Explorer* or *Source Control* view
- Adds `gitlens.resultsExplorer.location` setting to the interactive settings editor to specify where the *GitLens Results* explorer is shown — either in the *Explorer* or *Source Control* view
### Changed
@@ -117,11 +120,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Adds `gitlens.settings.mode` setting to specify the display mode of the interactive settings editor
- Adds a tree layout option to tags in the *GitLens* explorer — closes [#358](https://github.com/eamodio/vscode-gitlens/issues/358)
- Adds *Show GitLens Explorer* (`gitlens.showGitExplorer`) command — shows/expands the *GitLens* explorer
-- Adds *Show History Explorer* (`gitlens.showHistoryExplorer`) command — shows/expands the *GitLens History* explorer
+- Adds *Show File History Explorer* (`gitlens.showHistoryExplorer`) command — shows/expands the *GitLens File History* explorer
- Adds *Show Results Explorer* (`gitlens.showResultsExplorer`) command — shows/expands the *GitLens Results* explorer
### Changed
-- Moves the *GitLens*, *GitLens History*, and *GitLens Results* explorers under the Source Control activity (in the sidebar) 🎉 — closes [#213](https://github.com/eamodio/vscode-gitlens/issues/213)
+- Moves the *GitLens*, *GitLens File History*, and *GitLens Results* explorers under the Source Control activity (in the sidebar) 🎉 — closes [#213](https://github.com/eamodio/vscode-gitlens/issues/213)
- Showing results in the *GitLens Results* explorer now properly shows the explorer first
- Renames *Compare Line Revision with Previous* command (`gitlens.diffLineWithPrevious`) to *Compare Commit with Previous* for consistency with other commands
- Renames *Compare Line Revision with Working File* command (`gitlens.diffLineWithWorking`) to *Compare Commit with Working File* for consistency with other commands
@@ -179,9 +182,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
## [8.2.0] - 2018-03-31
### Added
-- Adds new stand-alone *GitLens History* explorer to visualize the history of the current file — undocked version of the *GitLens* explorer history view
+- Adds new stand-alone *GitLens File History* explorer to visualize the history of the current file — undocked version of the *GitLens* explorer history view
- 
+ 
- Adds richer tooltips to the *GitLens* and *GitLens Results* explorers, and richer working tree and upstream status to the *GitLens* explorer
@@ -903,16 +906,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Provides a context menu on each stash with *Apply Stashed Changes* (confirmation required), *Delete Stashed Changes* (confirmation required), *Open All Changes*, *Open All Changes with Working Tree*, *Open Files*, *Open Revisions*, *Copy Commit Message to Clipboard*, and *Refresh* commands
- Provides a context menu on each stashed file with *Apply Changes*, *Open Changes*, *Open Changes with Working Tree*, *Open File*, *Open Revision*, *Open File in Remote*, and *Show File History* commands
- - **History View** - provides the revision history of the active file
+ - **File History View** - provides the revision history of the active file
- 
+ 
- Automatically updates to track the active editor
- Provides a context menu with *Open File*, *Open File in Remote*, and *Refresh* commands
- Provides a context menu on each revision (commit) with *Open Changes*, *Open Changes with Working Tree*, *Open File*, *Open Revision*, *Open File in Remote*, *Open Revision in Remote*, *Apply Changes*, and *Show Commit File Details* commands
- - Quickly switch between views using the *Switch to Repository View* or *Switch to History View* commands
- - Provides toolbar commands to *Search Commits*, *Switch to Repository View* or *Switch to History View*, and *Refresh*
+ - Quickly switch between views using the *Switch to Repository View* or *Switch to File History View* commands
+ - Provides toolbar commands to *Search Commits*, *Switch to Repository View* or *Switch to File History View*, and *Refresh*
- Adds all-new interactivity to the hover annotations
diff --git a/README.md b/README.md
index 8ddb34b..2e3c535 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ GitLens simply helps you understand code better. Quickly glimpse into whom, why,
Here are just some of the features that GitLens provides,
- a [*GitLens* explorer](#gitlens-explorer "Jump to the GitLens explorer") to navigate and explore repositories
- - a [*GitLens History* explorer](#gitlens-history-explorer "Jump to the GitLens History explorer") to navigate and explore file histories
+ - a [*GitLens File History* explorer](#gitlens-file-history-explorer "Jump to the GitLens File History explorer") to navigate and explore file histories
- an on-demand [*GitLens Results* explorer](#gitlens-results-explorer "Jump to the GitLens Results explorer") to navigate and explore commit searches, visualize comparisons between branches, tags, commits, and more
- authorship [code lens](#code-lens "Jump to the Code Lens") showing the most recent commit and # of authors to the top of files and/or on code blocks
- an unobtrusive [current line blame](#current-line-blame "Jump to the Current Line Blame") annotation at the end of the line
@@ -101,9 +101,9 @@ For more advanced customizations, refer to the [settings documentation](#gitlens
## Features
### GitLens Explorer
-A [customizable](#gitlens-explorer-settings "Jump to the GitLens Explorer settings") explorer to navigate and explore repositories or file histories. The *GitLens* explorer provides two views (modes) — a Repository view and a History view.
-- A toolbar provides *Search Commits*, *Switch to Repository View* or *Switch to History View*, and *Refresh* commands
- - Quickly switch between views using the *Switch to Repository View* or *Switch to History View* commands
+A [customizable](#gitlens-explorer-settings "Jump to the GitLens Explorer settings") explorer to navigate and explore repositories or file histories. The *GitLens* explorer provides two views (modes) — a Repository view and a File History view.
+- A toolbar provides *Search Commits*, *Switch to Repository View* or *Switch to File History View*, and *Refresh* commands
+ - Quickly switch between views using the *Switch to Repository View* or *Switch to File History View* commands
- A context menu provides *Automatic Layout*, *List Layout*, *Tree Layout*, *Enable Automatic Refresh* or *Disable Automatic Refresh*, and *Follow Renames* or *Don't Follow Renames* commands
#### Repository view
@@ -172,12 +172,12 @@ The repository view provides a full Git repository explorer, which has the follo
- Revisions (commits) expand to show the set of files changed, complete with status indicators for adds, changes, renames, and deletes
- See the *Revisions (commits) expand* section under **Branches** above for more details
-### History view
+### File History view
-
+
-The history view provides the revision history of the current file, which has the following features,
+The file history view provides the revision history of the current file, which has the following features,
- Automatically updates to track the current editor
- A context menu provides *Open File*, *Open File in Remote* (if available), and *Refresh* commands
- An inline toolbar provides an *Open File* command
@@ -185,12 +185,12 @@ The history view provides the revision history of the current file, which has th
- *Open Changes*, *Open Changes with Working File*, *Open File*, *Open Revision*, *Open File in Remote* (if available), *Open Revision in Remote* (if available), *Apply Changes*, and *Show Commit File Details* commands
---
-### GitLens History Explorer
+### GitLens File History Explorer
-
+
-A [customizable](#gitlens-history-explorer-settings "Jump to the GitLens History Explorer settings") stand-alone explorer to visualize the history of the current file — undocked version of the *GitLens* Explorer history view
+A [customizable](#gitlens-file-history-explorer-settings "Jump to the GitLens File History Explorer settings") stand-alone explorer to visualize the history of the current file — undocked version of the *GitLens* Explorer history view
- Automatically updates to track the current editor
- A context menu provides *Open File*, *Open File in Remote* (if available), and *Refresh* commands
- An inline toolbar provides an *Open File* command
@@ -586,14 +586,14 @@ See also [Explorer Settings](#explorer-settings "Jump to the Explorer settings")
|`gitlens.gitExplorer.showTrackingBranch`|Specifies whether to show the tracking branch when displaying local branches in the *GitLens* explorer"
|`gitlens.gitExplorer.view`|Specifies the starting view of the *GitLens* explorer `auto` - shows the last selected view, defaults to `repository` `history` - shows the commit history of the current file `repository` - shows a repository explorer"
-### GitLens History Explorer Settings
+### GitLens File History Explorer Settings
See also [Explorer Settings](#explorer-settings "Jump to the Explorer settings")
|Name | Description
|-----|------------
-|`gitlens.historyExplorer.enabled`|Specifies whether to show the current file history undocked in a *GitLens History* explorer
-|`gitlens.historyExplorer.location`|Specifies where to show the `GitLens History` explorer `explorer` - adds to the Explorer view `scm` - adds to the Source Control view
+|`gitlens.historyExplorer.enabled`|Specifies whether to show the current file history undocked in a *GitLens File History* explorer
+|`gitlens.historyExplorer.location`|Specifies where to show the *GitLens File History* explorer `explorer` - adds to the Explorer view `scm` - adds to the Source Control view
### GitLens Results Explorer Settings
diff --git a/package.json b/package.json
index 3e55c32..73f3c93 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"url": "https://github.com/eamodio/vscode-gitlens.git"
},
"engines": {
- "vscode": "^1.23.0"
+ "vscode": "^1.25.0"
},
"main": "./out/extension",
"icon": "images/gitlens-icon.png",
@@ -530,7 +530,7 @@
"gitlens.historyExplorer.enabled": {
"type": "boolean",
"default": true,
- "description": "Specifies whether to show the current file history undocked in a `GitLens History` explorer",
+ "description": "Specifies whether to show the current file history undocked in a `GitLens File History` explorer",
"scope": "window"
},
"gitlens.historyExplorer.location": {
@@ -540,7 +540,7 @@
"explorer",
"scm"
],
- "description": "Specifies where to show the `GitLens History` explorer\n `explorer` - adds to the Explorer view\n `scm` - adds to the Source Control view",
+ "description": "Specifies where to show the `GitLens File History` explorer\n `explorer` - adds to the Explorer view\n `scm` - adds to the Source Control view",
"scope": "window"
},
"gitlens.hovers.annotations.changes": {
@@ -1368,7 +1368,7 @@
},
{
"command": "gitlens.showHistoryExplorer",
- "title": "Show History Explorer",
+ "title": "Show File History Explorer",
"category": "GitLens"
},
{
@@ -1832,7 +1832,7 @@
},
{
"command": "gitlens.gitExplorer.undockHistory",
- "title": "Undock History from GitLens Explorer",
+ "title": "Undock File History from GitLens Explorer",
"category": "GitLens",
"icon": {
"dark": "images/dark/icon-undock.svg",
@@ -1890,7 +1890,7 @@
},
{
"command": "gitlens.gitExplorer.switchToHistoryView",
- "title": "Switch to History View",
+ "title": "Switch to File History View",
"category": "GitLens",
"icon": {
"dark": "images/dark/icon-history.svg",
@@ -1917,7 +1917,7 @@
},
{
"command": "gitlens.historyExplorer.dock",
- "title": "Dock History to GitLens Explorer",
+ "title": "Dock File History to GitLens Explorer",
"category": "GitLens",
"icon": {
"dark": "images/dark/icon-dock.svg",
@@ -3315,7 +3315,7 @@
},
{
"id": "gitlens.historyExplorer:explorer",
- "name": "GitLens History",
+ "name": "GitLens File History",
"when": "gitlens:enabled && gitlens:historyExplorer == explorer"
},
{
@@ -3332,7 +3332,7 @@
},
{
"id": "gitlens.historyExplorer:scm",
- "name": "GitLens History",
+ "name": "GitLens File History",
"when": "gitlens:enabled && gitlens:historyExplorer == scm"
},
{
diff --git a/src/ui/settings/index.html b/src/ui/settings/index.html
index 61e0d57..896bdb1 100644
--- a/src/ui/settings/index.html
+++ b/src/ui/settings/index.html
@@ -365,20 +365,20 @@
-
+
GitLens Results Explorer
diff --git a/src/ui/welcome/index.html b/src/ui/welcome/index.html
index ef6eac5..186f524 100644
--- a/src/ui/welcome/index.html
+++ b/src/ui/welcome/index.html
@@ -138,7 +138,7 @@
NEW
Adds the ability to control where the
GitLens,
- GitLens History, and
+ GitLens File History, and
GitLens Results explorers are shown 🎉 — closes
#213,
#377
@@ -233,9 +233,9 @@
NEW
Adds
- Show History Explorer command (
+ Show File History Explorer command (
gitlens.showHistoryExplorer) — shows/expands the
- GitLens History explorer
+ GitLens File History explorer
@@ -485,11 +485,11 @@
NEW
Adds new stand-alone
- GitLens History explorer to visualize the history of the current file — undocked version
- of the
+ GitLens File History explorer to visualize the history of the current file — undocked
+ version of the
GitLens explorer history view
-
+
@@ -719,8 +719,8 @@
GitLens explorer to navigate and explore repositories
+ 
+ 
+