Preps v9.6.1

CHANGELOG.md

@@ -4,7 +4,7 @@ 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/).
 
-## [Unreleased]
+## [9.6.1] - 2019-04-017
 
 ### Added
 
@@ -13,7 +13,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Removed
 
-- Removes `-m` flag from `git log` when following renames (using `--follow`), because it ends up returning all merge commits (regardless if the file in question was changed or not)
+- Removes `-m` flag from `git log` when following renames (`--follow`), because it returns **all** merge commits, whether the file was changed or not
 
 ### Fixed
 
@@ -2758,6 +2758,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Initial release but still heavily a work in progress.
 
+[9.6.1]: https://github.com/eamodio/vscode-gitlens/compare/v9.6.0...eamodio:v9.6.1
 [9.6.0]: https://github.com/eamodio/vscode-gitlens/compare/v9.5.1...eamodio:v9.6.0
 [9.5.1]: https://github.com/eamodio/vscode-gitlens/compare/v9.5.0...eamodio:v9.5.1
 [9.5.0]: https://github.com/eamodio/vscode-gitlens/compare/v9.4.1...eamodio:v9.5.0

package.json

@@ -2,7 +2,7 @@
     "name": "gitlens",
     "displayName": "GitLens — Git supercharged",
     "description": "Supercharge the Git capabilities built into Visual Studio Code — Visualize code authorship at a glance via Git blame annotations and code lens, seamlessly navigate and explore Git repositories, gain valuable insights via powerful comparison commands, and so much more",
-    "version": "9.6.0",
+    "version": "9.6.1",
     "author": {
         "name": "Eric Amodio",
         "email": "eamodio@gmail.com"

src/webviews/apps/welcome/index.html

@@ -181,6 +181,33 @@
                                     <div class="changelog__details changelog__details--list"></div>
                                 </li>
                                 <li>
+                                    <span class="changelog__badge changelog__badge--added">NEW</span>Adds a
+                                    <i>Checkout</i> command to file nodes in the views to replace the local file with
+                                    the specified revision &mdash; closes
+                                    <a
+                                        title="Open Issue #684"
+                                        href="https://github.com/eamodio/vscode-gitlens/issues/684"
+                                        >#684</a
+                                    >
+                                    <div class="changelog__details changelog__details--list"></div>
+                                </li>
+                                <li>
+                                    <span class="changelog__badge changelog__badge--added">NEW</span>Adds a prompt to
+                                    enable the view to the <i>Show * View</i> commands when the specified view is
+                                    disabled &mdash; &mdash; closes
+                                    <a
+                                        title="Open Issue #710"
+                                        href="https://github.com/eamodio/vscode-gitlens/issues/710"
+                                        >#710</a
+                                    >,
+                                    <a
+                                        title="Open Issue #711"
+                                        href="https://github.com/eamodio/vscode-gitlens/issues/711"
+                                        >#711</a
+                                    >
+                                    <div class="changelog__details changelog__details--list"></div>
+                                </li>
+                                <li>
                                     <span class="changelog__badge changelog__badge--changed">IMPROVED</span>Removes the
                                     automatic suspension of the current line blame annotations while debugging &mdash;
                                     closes
@@ -292,6 +319,13 @@
                                     <div class="changelog__details changelog__details--list"></div>
                                 </li>
                                 <li>
+                                    <span class="changelog__badge changelog__badge--changed">IMPROVED</span>Removes
+                                    <code>-m</code> flag from <code>git log</code> when following renames
+                                    (<code>--follow</code>), because it returns <b>all</b> merge commits, whether the
+                                    file was changed or not
+                                    <div class="changelog__details changelog__details--list"></div>
+                                </li>
+                                <li>
                                     <span class="changelog__badge changelog__badge--fixed">FIXED</span>Fixes
                                     <a
                                         title="Open Issue #683"
@@ -323,6 +357,16 @@
                                     <div class="changelog__details changelog__details--list"></div>
                                 </li>
                                 <li>
+                                    <span class="changelog__badge changelog__badge--fixed">FIXED</span>Fixes
+                                    <a
+                                        title="Open Issue #701"
+                                        href="https://github.com/eamodio/vscode-gitlens/issues/701"
+                                        >#701</a
+                                    >
+                                    &mdash; Contributors shows no commits for mailmapped committer name
+                                    <div class="changelog__details changelog__details--list"></div>
+                                </li>
+                                <li>
                                     <span class="changelog__badge changelog__badge--fixed">FIXED</span>Fixes the
                                     behavior of the <i>Open Line Changes with Previous Revision</i>
                                     (<code>gitlens.diffLineWithPrevious</code>) command to follow the line history much
@@ -342,6 +386,22 @@
                                     <div class="changelog__details changelog__details--list"></div>
                                 </li>
                                 <li>
+                                    <span class="changelog__badge changelog__badge--fixed">FIXED</span>Fixes issues with
+                                    the <i>Line History</i> view sometimes showing a duplicate and out of order commit
+                                    <div class="changelog__details changelog__details--list"></div>
+                                </li>
+                                <li>
+                                    <span class="changelog__badge changelog__badge--fixed">FIXED</span>Fixes broken
+                                    <i>Open File</i> command on the root node of the <i>File History</i> and
+                                    <i>Line History</i> views
+                                    <div class="changelog__details changelog__details--list"></div>
+                                </li>
+                                <li>
+                                    <span class="changelog__badge changelog__badge--fixed">FIXED</span>Fixes broken
+                                    <i>Open Revision</i> command on status files of the <i>Repositories</i> view
+                                    <div class="changelog__details changelog__details--list"></div>
+                                </li>
+                                <li>
                                     <span class="changelog__badge changelog__badge--fixed">FIXED</span>Fixes the invite
                                     link to the
                                     <a title="Join us on Slack" href="https://vscode-slack.amod.io"