Skip to content

Commit c898a00

Browse files
eamodioeamodio
committed
Preps v9.6.1
1 parent f97f935 commit c898a00

File tree

3 files changed

+64
-3
lines changed

3 files changed

+64
-3
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
66

7-
## [Unreleased]
7+
## [9.6.1] - 2019-04-017
88

99
### Added
1010

@@ -13,7 +13,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
1313

1414
### Removed
1515

16-
- 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)
16+
- Removes `-m` flag from `git log` when following renames (`--follow`), because it returns **all** merge commits, whether the file was changed or not
1717

1818
### Fixed
1919

@@ -2758,6 +2758,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
27582758

27592759
- Initial release but still heavily a work in progress.
27602760

2761+
[9.6.1]: https://github.com/eamodio/vscode-gitlens/compare/v9.6.0...eamodio:v9.6.1
27612762
[9.6.0]: https://github.com/eamodio/vscode-gitlens/compare/v9.5.1...eamodio:v9.6.0
27622763
[9.5.1]: https://github.com/eamodio/vscode-gitlens/compare/v9.5.0...eamodio:v9.5.1
27632764
[9.5.0]: https://github.com/eamodio/vscode-gitlens/compare/v9.4.1...eamodio:v9.5.0

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "gitlens",
33
"displayName": "GitLens — Git supercharged",
44
"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",
5-
"version": "9.6.0",
5+
"version": "9.6.1",
66
"author": {
77
"name": "Eric Amodio",
88
"email": "[email protected]"

‎src/webviews/apps/welcome/index.html‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,33 @@ <h2 class="changelog__title">
180180
show in a each page when paginating a view list. Use 0 to specify no limit
181181
<div class="changelog__details changelog__details--list"></div>
182182
</li>
183+
<li>
184+
<span class="changelog__badge changelog__badge--added">NEW</span>Adds a
185+
<i>Checkout</i> command to file nodes in the views to replace the local file with
186+
the specified revision &mdash; closes
187+
<a
188+
title="Open Issue #684"
189+
href="https://github.com/eamodio/vscode-gitlens/issues/684"
190+
>#684</a
191+
>
192+
<div class="changelog__details changelog__details--list"></div>
193+
</li>
194+
<li>
195+
<span class="changelog__badge changelog__badge--added">NEW</span>Adds a prompt to
196+
enable the view to the <i>Show * View</i> commands when the specified view is
197+
disabled &mdash; &mdash; closes
198+
<a
199+
title="Open Issue #710"
200+
href="https://github.com/eamodio/vscode-gitlens/issues/710"
201+
>#710</a
202+
>,
203+
<a
204+
title="Open Issue #711"
205+
href="https://github.com/eamodio/vscode-gitlens/issues/711"
206+
>#711</a
207+
>
208+
<div class="changelog__details changelog__details--list"></div>
209+
</li>
183210
<li>
184211
<span class="changelog__badge changelog__badge--changed">IMPROVED</span>Removes the
185212
automatic suspension of the current line blame annotations while debugging &mdash;
@@ -291,6 +318,13 @@ <h2 class="changelog__title">
291318
size
292319
<div class="changelog__details changelog__details--list"></div>
293320
</li>
321+
<li>
322+
<span class="changelog__badge changelog__badge--changed">IMPROVED</span>Removes
323+
<code>-m</code> flag from <code>git log</code> when following renames
324+
(<code>--follow</code>), because it returns <b>all</b> merge commits, whether the
325+
file was changed or not
326+
<div class="changelog__details changelog__details--list"></div>
327+
</li>
294328
<li>
295329
<span class="changelog__badge changelog__badge--fixed">FIXED</span>Fixes
296330
<a
@@ -322,6 +356,16 @@ <h2 class="changelog__title">
322356
branch
323357
<div class="changelog__details changelog__details--list"></div>
324358
</li>
359+
<li>
360+
<span class="changelog__badge changelog__badge--fixed">FIXED</span>Fixes
361+
<a
362+
title="Open Issue #701"
363+
href="https://github.com/eamodio/vscode-gitlens/issues/701"
364+
>#701</a
365+
>
366+
&mdash; Contributors shows no commits for mailmapped committer name
367+
<div class="changelog__details changelog__details--list"></div>
368+
</li>
325369
<li>
326370
<span class="changelog__badge changelog__badge--fixed">FIXED</span>Fixes the
327371
behavior of the <i>Open Line Changes with Previous Revision</i>
@@ -341,6 +385,22 @@ <h2 class="changelog__title">
341385
the webview CSS font variables provided by VS Code
342386
<div class="changelog__details changelog__details--list"></div>
343387
</li>
388+
<li>
389+
<span class="changelog__badge changelog__badge--fixed">FIXED</span>Fixes issues with
390+
the <i>Line History</i> view sometimes showing a duplicate and out of order commit
391+
<div class="changelog__details changelog__details--list"></div>
392+
</li>
393+
<li>
394+
<span class="changelog__badge changelog__badge--fixed">FIXED</span>Fixes broken
395+
<i>Open File</i> command on the root node of the <i>File History</i> and
396+
<i>Line History</i> views
397+
<div class="changelog__details changelog__details--list"></div>
398+
</li>
399+
<li>
400+
<span class="changelog__badge changelog__badge--fixed">FIXED</span>Fixes broken
401+
<i>Open Revision</i> command on status files of the <i>Repositories</i> view
402+
<div class="changelog__details changelog__details--list"></div>
403+
</li>
344404
<li>
345405
<span class="changelog__badge changelog__badge--fixed">FIXED</span>Fixes the invite
346406
link to the

0 commit comments

Comments
 (0)