From ee124b53253f9c78d12400a92842888f3daefdcb Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Tue, 27 Jun 2017 01:33:11 -0400
Subject: [PATCH] Preps v4.2.0

---
 CHANGELOG.md | 20 ++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f868f60..de92b56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.2.0] - 2017-06-27
+## Added
+- Adds `Compare File with Revision...` command (`gitlens.diffWithRevision`) - compare the active file with the selected revision of the same file
+- Adds `Open Changed Files` command (`gitlens.openChangedFiles`) to the source control group context menu
+- Adds `Close Unchanged Files` command (`gitlens.closeUnchangedFiles`) to the source control group context menu
+- Adds `Open File in Remote` command (`gitlens.openFileInRemote`) to the source control resource context menu
+- Adds `Compare File with Revision...` command (`gitlens.diffWithRevision`) to the source control resource context menu
+- Adds `Show File History` command (`gitlens.showQuickFileHistory`) to the source control resource context menu
+
+## Changed
+- Renames `Compare File with...` command to `Compare File with Branch...`
+- Renames `Open Line Commit in Remote` command to `Open Commit in Remote`
+- Renames `Show Line Commit Details` command to `Show Commit File Details`
+- Updates the description of `gitlens.blame.line.enabled` to be clearer about its behavior
+- Updates the description of `gitlens.codeLens.enabled` to be clearer about its behavior
+
+### Fixed
+- Fixes #103 - Toggle file blame annotations disables line blame annotations if line blame annotations are off by default
+- Fixes another infinite loop in the `Close Unchanged Files` command
+
 ## [4.1.4] - 2017-06-25
 ## Changed
 - Optimizes performance of the `Compare with Previous` commands - also avoids trying to focus a line if we don't have one
diff --git a/package.json b/package.json
index 29192e8..c7468bd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "gitlens",
-    "version": "4.1.4",
+    "version": "4.2.0",
     "author": {
         "name": "Eric Amodio",
         "email": "eamodio@gmail.com"