diff --git a/CHANGELOG.md b/CHANGELOG.md index 97fe6f0014429..46ffcd739ed82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,29 @@ 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/). -## [9.6.2] - 2019-04-017 +## [9.6.3] - 2019-04-22 + +## Added + +- Adds a `gitlens.hovers.changesDiff` setting to specify whether to show just the changes to the line or the set of related changes in the _changes (diff)_ hover + +## Changes + +- Improves the maintaining of the line context when opening changes from the hovers +- Improves the accuracy of the _changes (diff)_ hover +- Improves the rendering of the diff in the _changes (diff)_ hover + +## Fixed + +- Fixes [#697](https://github.com/eamodio/vscode-gitlens/issues/697) - fixes git error handling for some linux OS' + +## [9.6.2] - 2019-04-17 ### Fixed - Fixes [#718](https://github.com/eamodio/vscode-gitlens/issues/718) - Can't see changed files when comparing branches -## [9.6.1] - 2019-04-017 +## [9.6.1] - 2019-04-17 ### Added @@ -2764,6 +2780,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.3]: https://github.com/eamodio/vscode-gitlens/compare/v9.6.2...eamodio:v9.6.3 [9.6.2]: https://github.com/eamodio/vscode-gitlens/compare/v9.6.1...eamodio:v9.6.2 [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 diff --git a/README.md b/README.md index cc45f40bf4dfe..32decbcb6bde3 100644 --- a/README.md +++ b/README.md @@ -695,7 +695,7 @@ GitLens is highly customizable and provides many configuration settings to allow | `gitlens.hovers.annotations.enabled` | Specifies whether to provide any hovers when showing blame annotations | | `gitlens.hovers.annotations.over` | Specifies when to trigger hovers when showing blame annotations

`annotation` - only shown when hovering over the line annotation
`line` - shown when hovering anywhere over the line | | `gitlens.hovers.avatars` | Specifies whether to show avatar images in hovers | -| `gitlens.hovers.changesDiff` | Specifies whether to show just the changes to the line or the full set of related changes in the _changes (diff)_ hover

`line` - Shows only the changes to the line

`hunk` - Shows the full set of related changes | +| `gitlens.hovers.changesDiff` | Specifies whether to show just the changes to the line or the set of related changes in the _changes (diff)_ hover

`line` - Shows only the changes to the line

`hunk` - Shows the set of related changes | | `gitlens.hovers.currentLine.changes` | Specifies whether to provide a _changes (diff)_ hover for the current line | | `gitlens.hovers.currentLine.details` | Specifies whether to provide a _commit details_ hover for the current line | | `gitlens.hovers.currentLine.enabled` | Specifies whether to provide any hovers for the current line | diff --git a/package.json b/package.json index d8575652118d5..e9b364d0f8439 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.2", + "version": "9.6.3", "author": { "name": "Eric Amodio", "email": "eamodio@gmail.com" @@ -572,9 +572,9 @@ ], "enumDescriptions": [ "Shows only the changes to the line", - "Shows the full set of related changes" + "Shows the set of related changes" ], - "markdownDescription": "Specifies whether to show just the changes to the line or the full set of related changes in the _changes (diff)_ hover", + "markdownDescription": "Specifies whether to show just the changes to the line or the set of related changes in the _changes (diff)_ hover", "scope": "window" }, "gitlens.hovers.detailsMarkdownFormat": { diff --git a/src/webviews/apps/welcome/index.html b/src/webviews/apps/welcome/index.html index 9ea9e489353c5..f9626ee24b6b4 100644 --- a/src/webviews/apps/welcome/index.html +++ b/src/webviews/apps/welcome/index.html @@ -194,7 +194,7 @@

  • NEWAdds a prompt to enable the view to the Show * View commands when the specified view is - disabled — — closes + disabled — closes >
    • +
  • + NEWAdds a + gitlens.hovers.changesDiff setting to specify whether to show just the + changes to the line or the set of related changes in the changes (diff) hover +
    +
  • IMPROVEDRemoves the automatic suspension of the current line blame annotations while debugging — @@ -250,6 +256,21 @@

    no longer loses the context of the last selected item before showing more

    • +
  • + IMPROVEDImproves the + maintaining of the line context when opening changes from the hovers +
    +
    • +
  • + IMPROVEDImproves the + accuracy of the changes (diff) hover +
    +
    • +
  • + IMPROVEDImproves the + rendering of the diff in the changes (diff) hover +
    +
  • IMPROVEDImproves the behavior of the @@ -366,6 +387,16 @@

    — Contributors shows no commits for mailmapped committer name

    • +
  • + FIXEDFixes + #697 + — fixes git error handling for some linux OS' +
    +
  • FIXEDFixes the behavior of the Open Line Changes with Previous Revision