diff --git a/CHANGELOG.md b/CHANGELOG.md index ebe8503..33e2daf 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/package.json b/package.json index b882ebb..e88529d 100644 --- a/package.json +++ b/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" diff --git a/src/webviews/apps/welcome/index.html b/src/webviews/apps/welcome/index.html index ea87b75..9ea9e48 100644 --- a/src/webviews/apps/welcome/index.html +++ b/src/webviews/apps/welcome/index.html @@ -181,6 +181,33 @@
-m
flag from git log
when following renames
+ (--follow
), because it returns all merge commits, whether the
+ file was changed or not
+
+ gitlens.diffLineWithPrevious
) command to follow the line history much
@@ -342,6 +386,22 @@