From 72e65f392d33800d945a9779608f32ae2d1f7a89 Mon Sep 17 00:00:00 2001
From: Eric Amodio
Date: Thu, 17 May 2018 11:45:58 -0400
Subject: [PATCH] Updates copy
---
CHANGELOG.md | 2 +-
README.md | 5 +++--
src/ui/welcome/index.html | 7 +++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b218258..7cdd9ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,7 +41,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Adds *Show Results Explorer* (`gitlens.showResultsExplorer`) command — shows/expands the *GitLens Results* explorer
### Changed
-- Moves the *GitLens* explorer, *GitLens History* explorer, and *GitLens Results* explorer under the Source Control activity (in the sidebar) 🎉 — closes [#213](https://github.com/eamodio/vscode-gitlens/issues/213)
+- 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)
- 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
diff --git a/README.md b/README.md
index 58a6023..29e216d 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
# What's new in GitLens 8
## 8.3 — May 2018
-- Moves the *GitLens* explorer, *GitLens History* explorer, and *GitLens Results* explorer under the Source Control activity (in the sidebar) 🎉 — closes [#213](https://github.com/eamodio/vscode-gitlens/issues/213)
+- 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)
- Adds user-defined modes for quickly toggling between sets of settings
![mode switch](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-mode-switch.png)
@@ -74,7 +74,8 @@ While GitLens is generously offered to everyone free of charge, if you find it u
GitLens simply helps you understand code better. Quickly glimpse into whom, why, and when a line or code block was changed. Jump back through history to gain further insights as to how and why the code evolved. Explore the history and evolution of a codebase.
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 or file histories
+ - 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
- an on-demand [*GitLens Results* view](#gitlens-results-view "Jump to the GitLens Results view") to 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
diff --git a/src/ui/welcome/index.html b/src/ui/welcome/index.html
index 2fc8b84..4dd2c4e 100644
--- a/src/ui/welcome/index.html
+++ b/src/ui/welcome/index.html
@@ -46,7 +46,7 @@
NEW
- Moves the GitLens explorer, GitLens History explorer, and GitLens Results explorer under the Source Control activity (in the sidebar) 🎉 — closes #213
+ Moves the GitLens, GitLens History, and GitLens Results explorers under the Source Control activity (in the sidebar) 🎉 — closes #213
NEW
@@ -149,7 +149,6 @@
Fixes #359 — Show changes of an added file in the first commit
-
FIXED
Fixes bronze typo thanks to PR #361 by Cory Forsyth (@bantic)
@@ -158,7 +157,6 @@
Fixes individually typo thanks to PR #364 by Brett Cannon (@brettcannon)
-
FIXED
Fixes issue where comparing previous revision during a merge/rebase conflict failed to show the correct contents
@@ -338,7 +336,8 @@
Here are just some of the features that GitLens provides,
- - a GitLens explorer to navigate and explore repositories or file histories
+ - a GitLens explorer to navigate and explore repositories
+ - a GitLens History explorer to navigate and explore file histories
- an on-demand GitLens Results view to explore commits, histories, and searches, or visualize comparisons between branches, tags, commits, and more
- authorship 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 annotation at the end of the line