From c898a005026ae1f63c67ae62106f787fc177cb92 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 17 Apr 2019 03:20:14 -0400 Subject: [PATCH] Preps v9.6.1 --- CHANGELOG.md | 5 +-- package.json | 2 +- src/webviews/apps/welcome/index.html | 60 ++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 3 deletions(-) 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 @@
  • + NEWAdds a + Checkout command to file nodes in the views to replace the local file with + the specified revision — closes + #684 +
    +
  • +
  • + NEWAdds a prompt to + enable the view to the Show * View commands when the specified view is + disabled — — closes + #710, + #711 +
    +
  • +
  • IMPROVEDRemoves the automatic suspension of the current line blame annotations while debugging — closes @@ -292,6 +319,13 @@
  • + IMPROVEDRemoves + -m flag from git log when following renames + (--follow), because it returns all merge commits, whether the + file was changed or not +
    +
  • +
  • FIXEDFixes
  • + FIXEDFixes + #701 + — Contributors shows no commits for mailmapped committer name +
    +
  • +
  • FIXEDFixes the behavior of the Open Line Changes with Previous Revision (gitlens.diffLineWithPrevious) command to follow the line history much @@ -342,6 +386,22 @@
  • + FIXEDFixes issues with + the Line History view sometimes showing a duplicate and out of order commit +
    +
  • +
  • + FIXEDFixes broken + Open File command on the root node of the File History and + Line History views +
    +
  • +
  • + FIXEDFixes broken + Open Revision command on status files of the Repositories view +
    +
  • +
  • FIXEDFixes the invite link to the