Fixes issue where work tree files could no show up

Preps v5.2.0
Adds gitlens.gitExplorer.includeWorkingTree setting
2026-02-12 11:08:34 -05:00 · 2017-09-23 23:36:43 -04:00 · 2017-09-23 23:29:49 -04:00 · 2017-09-23 16:29:56 -04:00 · 2017-09-22 01:01:43 -04:00 · 2017-09-22 00:48:57 -04:00
65 changed files with 1211 additions and 455 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,46 @@ 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]
+
+## [5.2.0] - 2017-09-23
+### Added
+- Adds new `Changed Files` node to the `Repository Status` node of the `GitLens` custom view's `Repository View` -- closes [#139](https://github.com/eamodio/vscode-gitlens/issues/139)
+  - Provides a at-a-glance view of all "working" changes
+  - Expands to a file-based view of all changed files in the working tree (enabled via `"gitlens.insiders": true`) and/or all files in all commits ahead of the upstream
+- Adds optional (on by default) working tree status information to the `Repository Status` node in the `GitLens` custom view
+- Adds `auto` value to `gitlens.gitExplorer.view` setting - closes [#150](https://github.com/eamodio/vscode-gitlens/issues/150)
+- Adds `gitlens.gitExplorer.enabled` setting to specify whether or not to show the `GitLens` custom view - closes [#144](https://github.com/eamodio/vscode-gitlens/issues/144)
+- Adds `gitlens.gitExplorer.includeWorkingTree` setting to specify whether or not to include working tree files inside the `Repository Status` node of the `GitLens` custom view
+- Adds `gitlens.gitExplorer.statusFileFormat` setting to the format of the status of a working or committed file in the `GitLens` custom view
+
+### Changed
+- Changes the sorting (now alphabetical) of files shown in the `GitLens` custom view
+- Changes the default of the `gitlens.gitExplorer.view` setting to `auto`
+- Changes the default of the `gitlens.gitExplorer.commitFormat` setting to add parentheses around the commit id
+- Removes many menu items from `editor/title` & `editor/title/context` by default -- can be re-enabled via the `gitlens.advanced.menus` setting
+
+### Fixed
+- Fixes [#146](https://github.com/eamodio/vscode-gitlens/issues/146) - Blame gutter annotation issue when commit contains emoji
+- Fixes an issue when running `Open File in Remote` with a multi-line selection wasn't properly opening the selection in GitLab -- thanks to [PR #145](https://github.com/eamodio/vscode-gitlens/pull/145) by Amanda Cameron ([@AmandaCameron](https://github.com/AmandaCameron))!
+- Fixes an issue where the `gitlens.advanced.menus` setting wasn't controlling all the menu items properly
+
+## [5.1.0] - 2017-09-15
+### Added
+- Adds full (multi-line) commit message to the `details` hover annotations -- closes [#116](https://github.com/eamodio/vscode-gitlens/issues/116)
+- Adds an external link icon to the `details` hover annotations to run the `Open Commit in Remote` command (`gitlens.openCommitInRemote`)
+
+### Changed
+- Optimizes performance of the providing blame annotations, especially for large files (saw a ~78% improvement on some files)
+- Optimizes date handling (parsing and formatting) for better performance and reduced memory consumption
+
+### Removed
+- Removes `gitlens.annotations.file.recentChanges.hover.wholeLine` setting as it didn't really make sense
+
+### Fixed
+- Fixes an issue where stashes with only untracked files would not show in the `Stashes` node of the GitLens custom view
+- Fixes an issue where stashes with untracked files would not show its untracked files in the GitLens custom view
+
 ## [5.0.0] - 2017-09-12
 ### Added
 - Adds an all-new `GitLens` custom view to the Explorer activity
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![](https://vsmarketplacebadge.apphb.com/version/eamodio.gitlens.svg)](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens)
 [![](https://vsmarketplacebadge.apphb.com/installs/eamodio.gitlens.svg)](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens)
 [![](https://vsmarketplacebadge.apphb.com/rating/eamodio.gitlens.svg)](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens)
-[![Chat at https://vscode-gitlens.slack.com/](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/chat-badge.png)](https://join.slack.com/t/vscode-gitlens/shared_invite/MjIxOTgxNDE3NzM0LTE1MDE2Nzk1MTgtMjkwMmZjMzcxNQ)
+[![Chat at https://vscode-dev-community.slack.com/](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/chat-badge.png)](https://join.slack.com/t/vscode-dev-community/shared_invite/enQtMjIxOTgxNDE3NzM0LWU5M2ZiZDU1YjBlMzdlZjA2YjBjYzRhYTM5NTgzMTAxMjdiNWU0ZmQzYWI3MWU5N2Q1YjBiYmQ4MzY0NDE1MzY)

 # GitLens

@@ -25,6 +25,7 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,
  - Adds a `changes` (diff) hover annotation to the current line annotation, which provides **instant** access to the line's previous version ([optional](#line-blame-annotation-settings), on by default)
    - Clicking on `Changes` will run the `Compare File Revisions` command (`gitlens.diffWith`)
    - Clicking the current and previous commit ids will run the `Show Commit Details` command (`gitlens.showQuickCommitDetails`)
+    - Clicking on external link icon will run the the `Open Commit in Remote` command (`gitlens.openCommitInRemote`)

    ![Line Blame Annotations](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-line-blame-annotations.png)

@@ -125,13 +126,17 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,
    ![GitLens Repository view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-custom-view-repository.png)

    - `Repository Status` node — provides the status of the repository
-      - Provides the name of the current branch, its upstream tracking branch (if available), and its upstream status (if available)
+      - Provides the name of the current branch, [optionally](#gitlens-custom-view-settings) its working tree status, and its upstream tracking branch and status (if available)
      - Provides indicator dots on the repository icon which denote the following:
        - `None` - up-to-date with the upstream
        - `Green` - ahead of the upstream
        - `Red` - behind the upstream
        - `Yellow` - both ahead of and behind the upstream
-      - Provides additional nodes, if the current branch is not synchronized with the upstream, to quickly see and explore the specific commits ahead and/or behind the upstream
+      - Provides additional upstream status nodes, if the current branch is tracking a remote branch and
+        - is behind the upstream — quickly see and explore the specific commits behind the upstream (i.e. commits that haven't been pulled)
+        - is ahead of the upstream — quickly see and explore the specific commits ahead of the upstream (i.e. commits that haven't been pushed)
+      - `Changed Files` node — provides a at-a-glance view of all "working" changes
+        - Expands to a file-based view of all changed files in the working tree ([optionally](#gitlens-custom-view-settings)) and/or all files in all commits ahead of the upstream
      - Provides a context menu with `Open Repository in Remote`, and `Refresh` commands

    - `Branches` node — provides a list of the local branches
@@ -331,7 +336,6 @@ GitLens is highly customizable and provides many configuration settings to allow
 |`gitlens.recentChanges.file.lineHighlight.locations`|Specifies where the highlights of the recently changed lines will be shown<br />`gutter` - adds a gutter glyph<br />`line` - adds a full-line highlight background color<br />`overviewRuler` - adds a decoration to the overviewRuler (scroll bar)
 |`gitlens.annotations.file.recentChanges.hover.details`|Specifies whether or not to provide a commit details hover annotation
 |`gitlens.annotations.file.recentChanges.hover.changes`|Specifies whether or not to provide a changes (diff) hover annotation
-|`gitlens.annotations.file.recentChanges.hover.wholeLine`|Specifies whether or not to trigger hover annotations over the whole line

 ### Code Lens Settings

@@ -342,7 +346,7 @@ GitLens is highly customizable and provides many configuration settings to allow
 |`gitlens.codeLens.recentChange.command`|Specifies the command to be executed when the `recent change` code lens is clicked<br />`gitlens.toggleFileBlame` - toggles file blame annotations<br />`gitlens.showBlameHistory` - opens the blame history explorer<br />`gitlens.showFileHistory` - opens the file history explorer<br />`gitlens.diffWithPrevious` - compares the current committed file with the previous commit<br />`gitlens.showQuickCommitDetails` - shows a commit details quick pick<br />`gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick<br />`gitlens.showQuickFileHistory` - shows a file history quick pick<br />`gitlens.showQuickRepoHistory` - shows a branch history quick pick
 |`gitlens.codeLens.authors.enabled`|Specifies whether or not to show an `authors` code lens showing number of authors of the file or code block and the most prominent author (if there is more than one)
 |`gitlens.codeLens.authors.command`|Specifies the command to be executed when the `authors` code lens is clicked<br />`gitlens.toggleFileBlame` - toggles file blame annotations<br />`gitlens.showBlameHistory` - opens the blame history explorer<br />`gitlens.showFileHistory` - opens the file history explorer<br />`gitlens.diffWithPrevious` - compares the current committed file with the previous commit<br />`gitlens.showQuickCommitDetails` - shows a commit details quick pick<br />`gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick<br />`gitlens.showQuickFileHistory` - shows a file history quick pick<br />`gitlens.showQuickRepoHistory` - shows a branch history quick pick
-|`gitlens.codeLens.locations`|Specifies where Git code lens will be shown in the document<br />`document` - adds code lens at the top of the document<br />`containers` -  adds code lens at the start of container-like symbols (modules, classes, interfaces, etc)<br />`blocks` -  adds code lens at the start of block-like symbols (functions, methods, properties, etc) lines<br />`custom` - adds code lens at the start of symbols contained in `gitlens.codeLens.locationCustomSymbols`
+|`gitlens.codeLens.locations`|Specifies where Git code lens will be shown in the document<br />`document` - adds code lens at the top of the document<br />`containers` - adds code lens at the start of container-like symbols (modules, classes, interfaces, etc)<br />`blocks` - adds code lens at the start of block-like symbols (functions, methods, properties, etc) lines<br />`custom` - adds code lens at the start of symbols contained in `gitlens.codeLens.locationCustomSymbols`
 |`gitlens.codeLens.customLocationSymbols`|Specifies the set of document symbols where Git code lens will be shown in the document
 |`gitlens.codeLens.perLanguageLocations`|Specifies where Git code lens will be shown in the document for the specified languages

@@ -350,12 +354,15 @@ GitLens is highly customizable and provides many configuration settings to allow

 |Name | Description
 |-----|------------
-|`gitlens.gitExplorer.view`|Specifies the starting view (mode) of the `GitLens` custom view<br />`history` - shows the commit history of the active file<br />`repository` - shows a repository explorer"
+|`gitlens.gitExplorer.enabled`|Specifies whether or not to show the `GitLens` custom view"
+|`gitlens.gitExplorer.view`|Specifies the starting view (mode) of the `GitLens` custom view<br /> `auto` - shows the last selected view, defaults to `repository`<br />`history` - shows the commit history of the active file<br />`repository` - shows a repository explorer"
+|`gitlens.gitExplorer.includeWorkingTree`|Specifies whether or not to include working tree files inside the `Repository Status` node of the `GitLens` custom view
 |`gitlens.gitExplorer.showTrackingBranch`|Specifies whether or not to show the tracking branch when displaying local branches in the `GitLens` custom view"
 |`gitlens.gitExplorer.commitFormat`|Specifies the format of committed changes in the `GitLens` custom view<br />Available tokens<br /> ${id} - commit id<br /> ${author} - commit author<br /> ${message} - commit message<br /> ${ago} - relative commit date (e.g. 1 day ago)<br /> ${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)<br /> ${authorAgo} - commit author, relative commit date<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
 |`gitlens.gitExplorer.commitFileFormat`|Specifies the format of a committed file in the `GitLens` custom view<br />Available tokens<br /> ${file} - file name<br /> ${filePath} - file name and path<br /> ${path} - file path
 |`gitlens.gitExplorer.stashFormat`|Specifies the format of stashed changes in the `GitLens` custom view<br />Available tokens<br /> ${id} - commit id<br /> ${author} - commit author<br /> ${message} - commit message<br /> ${ago} - relative commit date (e.g. 1 day ago)<br /> ${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)<br /> ${authorAgo} - commit author, relative commit date<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
 |`gitlens.gitExplorer.stashFileFormat`|Specifies the format of a stashed file in the `GitLens` custom view<br />Available tokens<br /> ${file} - file name<br /> ${filePath} - file name and path<br /> ${path} - file path
+|`gitlens.gitExplorer.statusFileFormat`|Specifies the format of the status of a working or committed file in the `GitLens` custom view<br />Available tokens<br /> ${file} - file name<br /> ${filePath} - file name and path<br /> ${path} - file path<br />${working} - optional indicator if the file is uncommitted

 ### Custom Remotes Settings

@@ -422,6 +429,7 @@ GitLens is highly customizable and provides many configuration settings to allow

 A big thanks to the people that have contributed to this project:

+- Amanda Cameron ([@AmandaCameron](https://github.com/AmandaCameron)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=AmandaCameron))
 - Peng Lyu ([@rebornix](https://github.com/rebornix)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=rebornix))
 - Aurelio Ogliari ([@nobitagit](https://github.com/nobitagit)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=nobitagit)
 - Johannes Rieken ([@jrieken](https://github.com/jrieken)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=jrieken))
--- a/images/dark/icon-diff.svg
+++ b/images/dark/icon-diff.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="16" height="22" xmlns="http://www.w3.org/2000/svg">
+    <path fill="#C5C5C5" d="m7.5,10l2,0l0,1l-2,0l0,2l-1,0l0,-2l-2,0l0,-1l2,0l0,-2l1,0l0,2l0,0zm-3,6l5,0l0,-1l-5,0l0,1l0,0zm4.5,-11l3.5,3.5l0,9.5c0,0.55 -0.45,1 -1,1l-9,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l6.5,0l0,0zm2.5,4l-3,-3l-6,0l0,12l9,0l0,-9l0,0zm-1.5,-6l-5.5,0l0,1l5,0l4,4l0,8l1,0l0,-8.5l-4.5,-4.5l0,0z" />
+</svg>
--- a/images/dark/icon-status-conflict.svg
+++ b/images/dark/icon-status-conflict.svg
@@ -1,6 +1,6 @@
 <svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
  <rect fill="#7F4E7E" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-    C
+    !
  </text>
 </svg>
--- a/images/dark/icon-status-unknown.svg
+++ b/images/dark/icon-status-unknown.svg
@@ -0,0 +1,6 @@
+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+  <rect fill="#6C6C6C" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
+    ?
+  </text>
+</svg>
--- a/images/light/icon-diff.svg
+++ b/images/light/icon-diff.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="16" height="22" xmlns="http://www.w3.org/2000/svg">
+    <path fill="#424242" d="m7.5,10l2,0l0,1l-2,0l0,2l-1,0l0,-2l-2,0l0,-1l2,0l0,-2l1,0l0,2l0,0zm-3,6l5,0l0,-1l-5,0l0,1l0,0zm4.5,-11l3.5,3.5l0,9.5c0,0.55 -0.45,1 -1,1l-9,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l6.5,0l0,0zm2.5,4l-3,-3l-6,0l0,12l9,0l0,-9l0,0zm-1.5,-6l-5.5,0l0,1l5,0l4,4l0,8l1,0l0,-8.5l-4.5,-4.5l0,0z" />
+</svg>
--- a/images/light/icon-status-conflict.svg
+++ b/images/light/icon-status-conflict.svg
@@ -1,6 +1,6 @@
 <svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
  <rect fill="#9B4F96" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-    C
+    !
  </text>
 </svg>
--- a/images/light/icon-status-unknown.svg
+++ b/images/light/icon-status-unknown.svg
@@ -0,0 +1,6 @@
+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+  <rect fill="#6C6C6C" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
+    ?
+  </text>
+</svg>
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "gitlens",
-    "version": "5.0.0",
+    "version": "5.2.0",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
@@ -47,11 +47,6 @@
                "json-stable-stringify": "1.0.1"
            }
        },
-        "ansi-regex": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-            "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
        "ansi-styles": {
            "version": "2.2.1",
            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
@@ -1336,11 +1331,6 @@
            "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
            "dev": true
        },
-        "is-fullwidth-code-point": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-            "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
        "is-glob": {
            "version": "3.1.0",
            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
@@ -2334,15 +2324,6 @@
            "integrity": "sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=",
            "dev": true
        },
-        "string-width": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-            "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-            "requires": {
-                "is-fullwidth-code-point": "2.0.0",
-                "strip-ansi": "4.0.0"
-            }
-        },
        "string_decoder": {
            "version": "1.0.3",
            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
@@ -2358,14 +2339,6 @@
            "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
            "dev": true
        },
-        "strip-ansi": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-            "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-            "requires": {
-                "ansi-regex": "3.0.0"
-            }
-        },
        "strip-bom": {
            "version": "2.0.0",
            "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "gitlens",
-    "version": "5.0.0",
+    "version": "5.2.0",
    "author": {
        "name": "Eric Amodio",
        "email": "eamodio@gmail.com"
@@ -15,8 +15,8 @@
    "badges": [
        {
            "url": "https://img.shields.io/badge/chat-on%20slack-brightgreen.svg",
-            "href": "https://join.slack.com/t/vscode-gitlens/shared_invite/MjIxOTgxNDE3NzM0LTE1MDE2Nzk1MTgtMjkwMmZjMzcxNQ",
-            "description": "Chat at https://vscode-gitlens.slack.com/"
+            "href": "https://join.slack.com/t/vscode-dev-community/shared_invite/enQtMjIxOTgxNDE3NzM0LWU5M2ZiZDU1YjBlMzdlZjA2YjBjYzRhYTM5NTgzMTAxMjdiNWU0ZmQzYWI3MWU5N2Q1YjBiYmQ4MzY0NDE1MzY",
+            "description": "Chat at https://vscode-dev-community.slack.com/"
        }
    ],
    "categories": [
@@ -132,11 +132,6 @@
                    "default": true,
                    "description": "Specifies whether or not to provide a changes (diff) hover annotation"
                },
-                "gitlens.annotations.file.recentChanges.hover.wholeLine": {
-                    "type": "boolean",
-                    "default": true,
-                    "description": "Specifies whether or not to trigger hover annotations over the whole line"
-                },
                "gitlens.annotations.line.hover.details": {
                    "type": "boolean",
                    "default": true,
@@ -308,7 +303,7 @@
                    "minItems": 1,
                    "maxItems": 4,
                    "uniqueItems": true,
-                    "description": "Specifies where Git code lens will be shown in the document\n `document` - adds code lens at the top of the document\n `containers` -  adds code lens at the start of container-like symbols (modules, classes, interfaces, etc)\n `blocks` -  adds code lens at the start of block-like symbols (functions, methods, properties, etc) lines\n `custom` - adds code lens at the start of symbols contained in `gitlens.codeLens.locationCustomSymbols`"
+                    "description": "Specifies where Git code lens will be shown in the document\n `document` - adds code lens at the top of the document\n `containers` - adds code lens at the start of container-like symbols (modules, classes, interfaces, etc)\n `blocks` - adds code lens at the start of block-like symbols (functions, methods, properties, etc) lines\n `custom` - adds code lens at the start of symbols contained in `gitlens.codeLens.locationCustomSymbols`"
                },
                "gitlens.codeLens.customLocationSymbols": {
                    "type": "array",
@@ -393,7 +388,7 @@
                                "minItems": 1,
                                "maxItems": 4,
                                "uniqueItems": true,
-                                "description": "Specifies where Git code lens will be shown in the document for the specified language\n `document` - adds code lens at the top of the document\n `containers` -  adds code lens at the start of container-like symbols (modules, classes, interfaces, etc)\n `blocks` -  adds code lens at the start of block-like symbols (functions, methods, properties, etc) lines\n `custom` - adds code lens at the start of symbols contained in `customSymbols`"
+                                "description": "Specifies where Git code lens will be shown in the document for the specified language\n `document` - adds code lens at the top of the document\n `containers` - adds code lens at the start of container-like symbols (modules, classes, interfaces, etc)\n `blocks` - adds code lens at the start of block-like symbols (functions, methods, properties, etc) lines\n `custom` - adds code lens at the start of symbols contained in `customSymbols`"
                            },
                            "customSymbols": {
                                "type": "array",
@@ -420,7 +415,7 @@
                },
                "gitlens.gitExplorer.commitFormat": {
                    "type": "string",
-                    "default": "${message} \u00a0\u2022\u00a0 ${authorAgo} \u00a0\u2022\u00a0 ${id}",
+                    "default": "${message} \u00a0\u2022\u00a0 ${authorAgo} \u00a0 (${id})",
                    "description": "Specifies the format of committed changes in the `GitLens` custom view\nAvailable tokens\n ${id} - commit id\n ${author} - commit author\n ${message} - commit message\n ${ago} - relative commit date (e.g. 1 day ago)\n ${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)\n ${authorAgo} - commit author, relative commit date\nSee https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting"
                },
                "gitlens.gitExplorer.commitFileFormat": {
@@ -428,6 +423,16 @@
                    "default": "${filePath}",
                    "description": "Specifies the format of a committed file in the `GitLens` custom view\nAvailable tokens\n ${file} - file name\n ${filePath} - file name and path\n ${path} - file path"
                },
+                "gitlens.gitExplorer.enabled": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Specifies whether or not to show the `GitLens` custom view"
+                },
+                "gitlens.gitExplorer.includeWorkingTree": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Specifies whether or not to include working tree files inside the `Repository Status` node of the `GitLens` custom view"
+                },
                "gitlens.gitExplorer.showTrackingBranch": {
                    "type": "boolean",
                    "default": true,
@@ -443,14 +448,20 @@
                    "default": "${filePath}",
                    "description": "Specifies the format of a stashed file in the `GitLens` custom view\nAvailable tokens\n ${file} - file name\n ${filePath} - file name and path\n ${path} - file path"
                },
+                "gitlens.gitExplorer.statusFileFormat": {
+                    "type": "string",
+                    "default": "${working}${filePath}",
+                    "description": "Specifies the format of the status of a working or committed file in the `GitLens` custom view\nAvailable tokens\n ${file} - file name\n ${filePath} - file name and path\n ${path} - file path\n ${working} - optional indicator if the file is uncommitted"
+                },
                "gitlens.gitExplorer.view": {
                    "type": "string",
-                    "default": "repository",
+                    "default": "auto",
                    "enum": [
+                        "auto",
                        "history",
                        "repository"
                    ],
-                    "description": "Specifies the starting view (mode) of the `GitLens` custom view\n `history` - shows the commit history of the active file\n `repository` - shows a repository explorer"
+                    "description": "Specifies the starting view (mode) of the `GitLens` custom view\n `auto` - shows the last selected view, defaults to `repository`\n `history` - shows the commit history of the active file\n `repository` - shows a repository explorer"
                },
                "gitlens.remotes": {
                    "type": "array",
@@ -651,16 +662,16 @@
                        },
                        "editorTitle": {
                            "blame": true,
-                            "fileDiff": true,
-                            "history": true,
-                            "remote": true,
-                            "status": true
+                            "fileDiff": false,
+                            "history": false,
+                            "remote": false,
+                            "status": false
                        },
                        "editorTitleContext": {
-                            "blame": true,
-                            "fileDiff": true,
-                            "history": true,
-                            "remote": true
+                            "blame": false,
+                            "fileDiff": false,
+                            "history": false,
+                            "remote": false
                        },
                        "explorerContext": {
                            "fileDiff": true,
@@ -1402,12 +1413,12 @@
                },
                {
                    "command": "gitlens.openFileInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && config.gitlens.advanced.menus.editorTitleContext.remote",
+                    "when": "gitlens:enabled && gitlens:hasRemotes && config.gitlens.advanced.menus.editorTitle.remote",
                    "group": "1_gitlens"
                },
                {
                    "command": "gitlens.openRepoInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && config.gitlens.advanced.menus.editorTitleContext.remote",
+                    "when": "gitlens:enabled && gitlens:hasRemotes && config.gitlens.advanced.menus.editorTitle.remote",
                    "group": "1_gitlens"
                },
                {
@@ -1742,9 +1753,54 @@
                    "when": "gitlens:hasRemotes && view == gitlens.gitExplorer && viewItem == gitlens:status",
                    "group": "1_gitlens@1"
                },
+                {
+                    "command": "gitlens.gitExplorer.openChanges",
+                    "when": "view == gitlens.gitExplorer && viewItem == gitlens:status-file",
+                    "group": "1_gitlens@1"
+                },
+                {
+                    "command": "gitlens.gitExplorer.openChangesWithWorking",
+                    "when": "view == gitlens.gitExplorer && viewItem == gitlens:status-file",
+                    "group": "1_gitlens@2"
+                },
+                {
+                    "command": "gitlens.gitExplorer.openFile",
+                    "when": "view == gitlens.gitExplorer && viewItem == gitlens:status-file",
+                    "group": "2_gitlens@1"
+                },
+                {
+                    "command": "gitlens.gitExplorer.openFileRevision",
+                    "when": "view == gitlens.gitExplorer && viewItem == gitlens:status-file",
+                    "group": "2_gitlens@2"
+                },
+                {
+                    "command": "gitlens.openFileInRemote",
+                    "when": "gitlens:hasRemotes && view == gitlens.gitExplorer && viewItem == gitlens:status-file",
+                    "group": "3_gitlens@1"
+                },
+                {
+                    "command": "gitlens.showQuickFileHistory",
+                    "when": "view == gitlens.gitExplorer && viewItem == gitlens:status-file && gitlens:gitExplorer:view == repository",
+                    "group": "5_gitlens@1"
+                },
+                {
+                    "command": "gitlens.showQuickCommitFileDetails",
+                    "when": "view == gitlens.gitExplorer && viewItem == gitlens:status-file",
+                    "group": "5_gitlens@2"
+                },
+                {
+                    "command": "gitlens.gitExplorer.openFile",
+                    "when": "view == gitlens.gitExplorer && viewItem == gitlens:status-file-commits",
+                    "group": "1_gitlens@1"
+                },
+                {
+                    "command": "gitlens.openFileInRemote",
+                    "when": "gitlens:hasRemotes && view == gitlens.gitExplorer && viewItem == gitlens:status-file-commits",
+                    "group": "1_gitlens@2"
+                },
                {
                    "command": "gitlens.gitExplorer.refresh",
-                    "when": "view == gitlens.gitExplorer && viewItem != gitlens:commit-file && viewItem != gitlens:stash-file",
+                    "when": "view == gitlens.gitExplorer && viewItem != gitlens:commit-file && viewItem != gitlens:stash-file && viewItem != gitlens:status-file",
                    "group": "9_gitlens@1"
                }
            ]
@@ -1846,7 +1902,7 @@
                {
                    "id": "gitlens.gitExplorer",
                    "name": "GitLens",
-                    "when": "gitlens:enabled"
+                    "when": "gitlens:enabled && config.gitlens.gitExplorer.enabled"
                }
            ]
        }
@@ -1876,7 +1932,6 @@
        "lodash.once": "4.1.1",
        "moment": "2.18.1",
        "spawn-rx": "2.0.11",
-        "string-width": "2.1.1",
        "tmp": "0.0.33"
    },
    "devDependencies": {
--- a/src/annotations/annotationController.ts
+++ b/src/annotations/annotationController.ts
@@ -222,7 +222,7 @@ export class AnnotationController extends Disposable {
    }

    getProvider(editor: TextEditor | undefined): AnnotationProviderBase | undefined {
-        if (!editor || !editor.document || !this.git.isEditorBlameable(editor)) return undefined;
+        if (editor === undefined || editor.document === undefined || !this.git.isEditorBlameable(editor)) return undefined;

        return this._annotationProviders.get(editor.viewColumn || -1);
    }
@@ -233,7 +233,7 @@ export class AnnotationController extends Disposable {
        if (!editor || !editor.document || !this.git.isEditorBlameable(editor)) return false;

        const currentProvider = this._annotationProviders.get(editor.viewColumn || -1);
-        if (currentProvider && TextEditorComparer.equals(currentProvider.editor, editor)) {
+        if (currentProvider !== undefined && TextEditorComparer.equals(currentProvider.editor, editor)) {
            await currentProvider.selection(shaOrLine);
            return true;
        }
--- a/src/annotations/annotations.ts
+++ b/src/annotations/annotations.ts
@@ -1,10 +1,9 @@
-import { Strings } from '../system';
+import { Dates, Objects, Strings } from '../system';
 import { DecorationInstanceRenderOptions, DecorationOptions, MarkdownString, ThemableDecorationRenderOptions } from 'vscode';
-import { DiffWithCommand, ShowQuickCommitDetailsCommand } from '../commands';
+import { DiffWithCommand, OpenCommitInRemoteCommand, ShowQuickCommitDetailsCommand } from '../commands';
 import { IThemeConfig, themeDefaults } from '../configuration';
 import { GlyphChars } from '../constants';
 import { CommitFormatter, GitCommit, GitDiffChunkLine, GitService, GitUri, ICommitFormatOptions } from '../gitService';
-import * as moment from 'moment';

 interface IHeatmapConfig {
    enabled: boolean;
@@ -28,13 +27,13 @@ const escapeMarkdownRegEx = /[`\>\#\*\_\-\+\.]/g;

 export class Annotations {

-    static applyHeatmap(decoration: DecorationOptions, date: Date, now: moment.Moment) {
+    static applyHeatmap(decoration: DecorationOptions, date: Date, now: number) {
        const color = this._getHeatmapColor(now, date);
        (decoration.renderOptions!.before! as any).borderColor = color;
    }

-    private static _getHeatmapColor(now: moment.Moment, date: Date) {
-        const days = now.diff(moment(date), 'days');
+    private static _getHeatmapColor(now: number, date: Date) {
+        const days = Dates.dateDaysFromNow(date, now);

        if (days <= 2) return '#ffeca7';
        if (days <= 7) return '#ffdd8c';
@@ -48,7 +47,7 @@ export class Annotations {
        return '#793738';
    }

-    static getHoverMessage(commit: GitCommit, dateFormat: string | null): MarkdownString {
+    static getHoverMessage(commit: GitCommit, dateFormat: string | null, hasRemotes: boolean): MarkdownString {
        if (dateFormat === null) {
            dateFormat = 'MMMM Do, YYYY h:MMa';
        }
@@ -65,7 +64,11 @@ export class Annotations {
            message = `\n\n> ${message}`;
        }

-        const markdown = new MarkdownString(`[\`${commit.shortSha}\`](${ShowQuickCommitDetailsCommand.getMarkdownCommandArgs(commit.sha)}) &nbsp; __${commit.author}__, ${moment(commit.date).fromNow()} &nbsp; _(${moment(commit.date).format(dateFormat)})_${message}`);
+        const openInRemoteCommand = hasRemotes
+            ? `${'&nbsp;'.repeat(3)} [\`${GlyphChars.ArrowUpRight}\`](${OpenCommitInRemoteCommand.getMarkdownCommandArgs(commit.sha)} "Open in Remote")`
+            : '';
+
+        const markdown = new MarkdownString(`[\`${commit.shortSha}\`](${ShowQuickCommitDetailsCommand.getMarkdownCommandArgs(commit.sha)} "Show Commit Details") &nbsp; __${commit.author}__, ${commit.fromNow()} &nbsp; _(${commit.formatDate(dateFormat)})_ ${openInRemoteCommand} &nbsp; ${message}`);
        markdown.isTrusted = true;
        return markdown;
    }
@@ -75,8 +78,8 @@ export class Annotations {

        const codeDiff = this._getCodeDiff(chunkLine);
        const markdown = new MarkdownString(commit.isUncommitted
-            ? `[\`Changes\`](${DiffWithCommand.getMarkdownCommandArgs(commit)}) &nbsp; ${GlyphChars.Dash} &nbsp; _uncommitted_\n${codeDiff}`
-            : `[\`Changes\`](${DiffWithCommand.getMarkdownCommandArgs(commit)}) &nbsp; ${GlyphChars.Dash} &nbsp; [\`${commit.previousShortSha}\`](${ShowQuickCommitDetailsCommand.getMarkdownCommandArgs(commit.previousSha!)}) ${GlyphChars.ArrowLeftRight} [\`${commit.shortSha}\`](${ShowQuickCommitDetailsCommand.getMarkdownCommandArgs(commit.sha)})\n${codeDiff}`);
+            ? `[\`Changes\`](${DiffWithCommand.getMarkdownCommandArgs(commit)} "Open Changes") &nbsp; ${GlyphChars.Dash} &nbsp; _uncommitted_\n${codeDiff}`
+            : `[\`Changes\`](${DiffWithCommand.getMarkdownCommandArgs(commit)} "Open Changes") &nbsp; ${GlyphChars.Dash} &nbsp; [\`${commit.previousShortSha}\`](${ShowQuickCommitDetailsCommand.getMarkdownCommandArgs(commit.previousSha!)} "Show Commit Details") ${GlyphChars.ArrowLeftRight} [\`${commit.shortSha}\`](${ShowQuickCommitDetailsCommand.getMarkdownCommandArgs(commit.sha)} "Show Commit Details")\n${codeDiff}`);
        markdown.isTrusted = true;
        return markdown;
    }
@@ -98,22 +101,22 @@ export class Annotations {
        } as DecorationOptions;
    }

-    static detailsHover(commit: GitCommit, dateFormat: string | null): DecorationOptions {
-        const message = this.getHoverMessage(commit, dateFormat);
+    static detailsHover(commit: GitCommit, dateFormat: string | null, hasRemotes: boolean): DecorationOptions {
+        const message = this.getHoverMessage(commit, dateFormat, hasRemotes);
        return {
            hoverMessage: message
        } as DecorationOptions;
    }

    static gutter(commit: GitCommit, format: string, dateFormatOrFormatOptions: string | null | ICommitFormatOptions, renderOptions: IRenderOptions): DecorationOptions {
-        const content = Strings.pad(CommitFormatter.fromTemplate(format, commit, dateFormatOrFormatOptions), 1, 1);
+        const message = CommitFormatter.fromTemplate(format, commit, dateFormatOrFormatOptions);

        return {
            renderOptions: {
                before: {
                    ...renderOptions.before,
                    ...{
-                        contentText: content
+                        contentText: Strings.pad(message.replace(/ /g, GlyphChars.Space), 1, 1)
                    }
                },
                dark: {
@@ -130,9 +133,23 @@ export class Annotations {
        } as DecorationOptions;
    }

-    static gutterRenderOptions(cfgTheme: IThemeConfig, heatmap: IHeatmapConfig): IRenderOptions {
+    static gutterRenderOptions(cfgTheme: IThemeConfig, heatmap: IHeatmapConfig, options: ICommitFormatOptions): IRenderOptions {
        const cfgFileTheme = cfgTheme.annotations.file.gutter;

+        // Try to get the width of the string, if there is a cap
+        let width = 4; // Start with a padding
+        for (const token of Objects.values<Strings.ITokenOptions | undefined>(options.tokenOptions)) {
+            if (token === undefined) continue;
+
+            // If any token is uncapped, kick out and set no max
+            if (token.truncateTo == null) {
+                width = 0;
+                break;
+            }
+
+            width += token.truncateTo;
+        }
+
        let borderStyle = undefined;
        let borderWidth = undefined;
        if (heatmap.enabled) {
@@ -149,7 +166,8 @@ export class Annotations {
                borderStyle: borderStyle,
                borderWidth: borderWidth,
                height: '100%',
-                margin: '0 26px -1px 0'
+                margin: '0 26px -1px 0',
+                width: (width > 4) ? `${width}ch` : undefined
            },
            dark: {
                backgroundColor: cfgFileTheme.dark.backgroundColor || undefined,
@@ -164,11 +182,12 @@ export class Annotations {
        } as IRenderOptions;
    }

-    static hover(commit: GitCommit, renderOptions: IRenderOptions, heatmap: boolean, dateFormat: string | null): DecorationOptions {
-        return {
-            hoverMessage: this.getHoverMessage(commit, dateFormat),
-            renderOptions: heatmap ? { before: { ...renderOptions.before } } : undefined
+    static hover(commit: GitCommit, renderOptions: IRenderOptions, now: number): DecorationOptions {
+        const decoration = {
+            renderOptions: { before: { ...renderOptions.before } }
        } as DecorationOptions;
+        this.applyHeatmap(decoration, commit.date, now);
+        return decoration;
    }

    static hoverRenderOptions(cfgTheme: IThemeConfig, heatmap: IHeatmapConfig): IRenderOptions {
@@ -191,10 +210,11 @@ export class Annotations {
            truncateMessageAtNewLine: true,
            dateFormat: dateFormat
        } as ICommitFormatOptions);
+
        return {
            renderOptions: {
                after: {
-                    contentText: Strings.pad(message, 1, 1)
+                    contentText: Strings.pad(message.replace(/ /g, GlyphChars.Space), 1, 1)
                },
                dark: {
                    after: {
--- a/src/annotations/blameAnnotationProvider.ts
+++ b/src/annotations/blameAnnotationProvider.ts
@@ -1,13 +1,15 @@
 'use strict';
 import { Iterables } from '../system';
-import { ExtensionContext, Range, TextEditor, TextEditorDecorationType } from 'vscode';
+import { CancellationToken, Disposable, ExtensionContext, Hover, HoverProvider, languages, Position, Range, TextDocument, TextEditor, TextEditorDecorationType } from 'vscode';
 import { AnnotationProviderBase } from './annotationProvider';
-import { GitBlame, GitService, GitUri } from '../gitService';
+import { Annotations, endOfLineIndex } from './annotations';
+import { GitBlame, GitCommit, GitService, GitUri } from '../gitService';
 import { WhitespaceController } from './whitespaceController';

-export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase {
+export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase implements HoverProvider {

    protected _blame: Promise<GitBlame | undefined>;
+    protected _hoverProviderDisposable: Disposable;

    constructor(context: ExtensionContext, editor: TextEditor, decoration: TextEditorDecorationType | undefined, highlightDecoration: TextEditorDecorationType | undefined, whitespaceController: WhitespaceController | undefined, protected git: GitService, protected uri: GitUri) {
        super(context, editor, decoration, highlightDecoration, whitespaceController);
@@ -15,6 +17,11 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
        this._blame = this.git.getBlameForFile(this.uri);
    }

+    async clear() {
+        this._hoverProviderDisposable && this._hoverProviderDisposable.dispose();
+        super.clear();
+    }
+
    async selection(shaOrLine?: string | number, blame?: GitBlame) {
        if (!this.highlightDecoration) return;

@@ -56,6 +63,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
        const blame = await this._blame;
        return blame !== undefined && blame.lines.length !== 0;
    }
+
    protected async getBlame(requiresWhitespaceHack: boolean): Promise<GitBlame | undefined> {
        let whitespacePromise: Promise<void> | undefined;
        // HACK: Until https://github.com/Microsoft/vscode/issues/11485 is fixed -- override whitespace (turn off)
@@ -64,18 +72,47 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
        }

        let blame: GitBlame | undefined;
-        if (whitespacePromise) {
+        if (whitespacePromise !== undefined) {
            [blame] = await Promise.all([this._blame, whitespacePromise]);
        }
        else {
            blame = await this._blame;
        }

-        if (blame === undefined || !blame.lines.length) {
+        if (blame === undefined || blame.lines.length === 0) {
            this.whitespaceController && await this.whitespaceController.restore();
            return undefined;
        }

        return blame;
    }
+
+    registerHoverProvider() {
+        this._hoverProviderDisposable = languages.registerHoverProvider({ pattern: this.uri.fsPath }, this);
+    }
+
+    async provideHover(document: TextDocument, position: Position, token: CancellationToken): Promise<Hover | undefined> {
+        // Avoid double annotations if we are showing the whole-file hover blame annotations
+        if (this._config.blame.line.enabled && this.editor.selection.start.line === position.line) return undefined;
+
+        const cfg = this._config.annotations.file.gutter;
+        if (!cfg.hover.wholeLine && position.character !== 0) return undefined;
+
+        const blame = await this.getBlame(true);
+        if (blame === undefined) return undefined;
+
+        const line = blame.lines[position.line - this.uri.offset];
+
+        const commit = blame.commits.get(line.sha);
+        if (commit === undefined) return undefined;
+
+        // Get the full commit message -- since blame only returns the summary
+        let logCommit: GitCommit | undefined = undefined;
+        if (!commit.isUncommitted) {
+            logCommit = await this.git.getLogCommit(commit.repoPath, commit.uri.fsPath, commit.sha);
+        }
+
+        const message = Annotations.getHoverMessage(logCommit || commit, this._config.defaultDateFormat, this.git.hasRemotes(commit.repoPath));
+        return new Hover(message, document.validateRange(new Range(position.line, 0, position.line, endOfLineIndex)));
+    }
 }
--- a/src/annotations/gutterBlameAnnotationProvider.ts
+++ b/src/annotations/gutterBlameAnnotationProvider.ts
@@ -2,11 +2,11 @@
 import { Strings } from '../system';
 import { DecorationOptions, Range } from 'vscode';
 import { FileAnnotationType } from './annotationController';
-import { Annotations, endOfLineIndex } from './annotations';
+import { Annotations } from './annotations';
 import { BlameAnnotationProviderBase } from './blameAnnotationProvider';
 import { GlyphChars } from '../constants';
 import { GitBlameCommit, ICommitFormatOptions } from '../gitService';
-import * as moment from 'moment';
+import { Logger } from '../logger';

 export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {

@@ -16,7 +16,7 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {
        const blame = await this.getBlame(true);
        if (blame === undefined) return false;

-        // console.time('Computing blame annotations...');
+        const start = process.hrtime();

        const cfg = this._config.annotations.file.gutter;

@@ -32,59 +32,53 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {
            tokenOptions: tokenOptions
        };

-        const now = moment();
+        const now = Date.now();
        const offset = this.uri.offset;
-        const renderOptions = Annotations.gutterRenderOptions(this._config.theme, cfg.heatmap);
-        const dateFormat = this._config.defaultDateFormat;
+        const renderOptions = Annotations.gutterRenderOptions(this._config.theme, cfg.heatmap, options);
        const separateLines = this._config.theme.annotations.file.gutter.separateLines;

        const decorations: DecorationOptions[] = [];
-        const document = this.document;
+        const decorationsMap: { [sha: string]: DecorationOptions | undefined } = Object.create(null);

        let commit: GitBlameCommit | undefined;
        let compacted = false;
-        let details: DecorationOptions | undefined;
        let gutter: DecorationOptions | undefined;
        let previousSha: string | undefined;

        for (const l of blame.lines) {
-            commit = blame.commits.get(l.sha);
-            if (commit === undefined) continue;
-
            const line = l.line + offset;

            if (previousSha === l.sha) {
                // Use a shallow copy of the previous decoration options
                gutter = { ...gutter } as DecorationOptions;
+
                if (cfg.compact && !compacted) {
                    // Since we are wiping out the contextText make sure to copy the objects
-                    gutter.renderOptions = { ...gutter.renderOptions };
-                    gutter.renderOptions.before = {
-                        ...gutter.renderOptions.before,
-                        ...{ contentText: GlyphChars.Space.repeat(Strings.getWidth(gutter.renderOptions!.before!.contentText!)) }
+                    gutter.renderOptions = {
+                        ...gutter.renderOptions,
+                        before: {
+                            ...gutter.renderOptions!.before,
+                            contentText: GlyphChars.Space.repeat(Strings.width(gutter.renderOptions!.before!.contentText!))
+                        }
                    };

                    if (separateLines) {
-                        gutter.renderOptions.dark = { ...gutter.renderOptions.dark };
-                        gutter.renderOptions.dark.before = { ...gutter.renderOptions.dark.before, ...{ textDecoration: 'none' } };
-                        gutter.renderOptions.light = { ...gutter.renderOptions.light };
-                        gutter.renderOptions.light.before = { ...gutter.renderOptions.light.before, ...{ textDecoration: 'none' } };
+                        gutter.renderOptions.dark = {
+                            ...gutter.renderOptions.dark,
+                            before: { ...gutter.renderOptions.dark!.before, textDecoration: 'none' }
+                        };
+                        gutter.renderOptions.light = {
+                            ...gutter.renderOptions.light,
+                            before: { ...gutter.renderOptions.light!.before, textDecoration: 'none' }
+                        };
                    }

                    compacted = true;
                }

-                const endIndex = document.lineAt(line).firstNonWhitespaceCharacterIndex;
-                gutter.range = new Range(line, 0, line, endIndex);
-                decorations.push(gutter);
+                gutter.range = new Range(line, 0, line, 0);

-                if (details !== undefined) {
-                    details = { ...details } as DecorationOptions;
-                    details.range = cfg.hover.wholeLine
-                        ? document.validateRange(new Range(line, 0, line, endOfLineIndex))
-                        : gutter.range;
-                    decorations.push(details);
-                }
+                decorations.push(gutter);

                continue;
            }
@@ -92,30 +86,43 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {
            compacted = false;
            previousSha = l.sha;

+            gutter = decorationsMap[l.sha];
+            if (gutter !== undefined) {
+                gutter = {
+                    ...gutter,
+                    range: new Range(line, 0, line, 0)
+                } as DecorationOptions;
+
+                decorations.push(gutter);
+
+                continue;
+            }
+
+            commit = blame.commits.get(l.sha);
+            if (commit === undefined) continue;
+
            gutter = Annotations.gutter(commit, cfg.format, options, renderOptions);

            if (cfg.heatmap.enabled) {
                Annotations.applyHeatmap(gutter, commit.date, now);
            }

-            const endIndex = document.lineAt(line).firstNonWhitespaceCharacterIndex;
-            gutter.range = new Range(line, 0, line, endIndex);
-            decorations.push(gutter);
+            gutter.range = new Range(line, 0, line, 0);

-            if (cfg.hover.details) {
-                details = Annotations.detailsHover(commit, dateFormat);
-                details.range = cfg.hover.wholeLine
-                    ? document.validateRange(new Range(line, 0, line, endOfLineIndex))
-                    : gutter.range;
-                decorations.push(details);
-            }
+            decorations.push(gutter);
+            decorationsMap[l.sha] = gutter;
        }

        if (decorations.length) {
            this.editor.setDecorations(this.decoration!, decorations);
        }

-        // console.timeEnd('Computing blame annotations...');
+        const duration = process.hrtime(start);
+        Logger.log(`${(duration[0] * 1000) + Math.floor(duration[1] / 1000000)} ms to compute gutter blame annotations`);
+
+        if (cfg.hover.details) {
+            this.registerHoverProvider();
+        }

        this.selection(shaOrLine, blame);
        return true;
--- a/src/annotations/hoverBlameAnnotationProvider.ts
+++ b/src/annotations/hoverBlameAnnotationProvider.ts
@@ -1,63 +1,70 @@
 'use strict';
 import { DecorationOptions, Range } from 'vscode';
 import { FileAnnotationType } from './annotationController';
-import { Annotations, endOfLineIndex } from './annotations';
+import { Annotations } from './annotations';
 import { BlameAnnotationProviderBase } from './blameAnnotationProvider';
 import { GitBlameCommit } from '../gitService';
-import * as moment from 'moment';
+import { Logger } from '../logger';

 export class HoverBlameAnnotationProvider extends BlameAnnotationProviderBase {

    async provideAnnotation(shaOrLine?: string | number): Promise<boolean> {
        this.annotationType = FileAnnotationType.Hover;

-        const blame = await this.getBlame(this._config.annotations.file.hover.heatmap.enabled);
-        if (blame === undefined) return false;
-
-        // console.time('Computing blame annotations...');
-
        const cfg = this._config.annotations.file.hover;

-        const now = moment();
-        const offset = this.uri.offset;
-        const renderOptions = Annotations.hoverRenderOptions(this._config.theme, cfg.heatmap);
-        const dateFormat = this._config.defaultDateFormat;
+        const blame = await this.getBlame(cfg.heatmap.enabled);
+        if (blame === undefined) return false;

-        const decorations: DecorationOptions[] = [];
-        const document = this.document;
+        if (cfg.heatmap.enabled) {
+            const start = process.hrtime();

-        let commit: GitBlameCommit | undefined;
-        let hover: DecorationOptions | undefined;
+            const now = Date.now();
+            const offset = this.uri.offset;
+            const renderOptions = Annotations.hoverRenderOptions(this._config.theme, cfg.heatmap);

-        for (const l of blame.lines) {
-            commit = blame.commits.get(l.sha);
-            if (commit === undefined) continue;
+            const decorations: DecorationOptions[] = [];
+            const decorationsMap: { [sha: string]: DecorationOptions } = Object.create(null);

-            const line = l.line + offset;
+            let commit: GitBlameCommit | undefined;
+            let hover: DecorationOptions | undefined;

-            hover = Annotations.hover(commit, renderOptions, cfg.heatmap.enabled, dateFormat);
+            for (const l of blame.lines) {
+                const line = l.line + offset;
+
+                hover = decorationsMap[l.sha];
+
+                if (hover !== undefined) {
+                    hover = {
+                        ...hover,
+                        range: new Range(line, 0, line, 0)
+                    } as DecorationOptions;
+
+                    decorations.push(hover);
+
+                    continue;
+                }
+
+                commit = blame.commits.get(l.sha);
+                if (commit === undefined) continue;
+
+                hover = Annotations.hover(commit, renderOptions, now);
+                hover.range = new Range(line, 0, line, 0);
+
+                decorations.push(hover);
+                decorationsMap[l.sha] = hover;

-            if (cfg.wholeLine) {
-                hover.range = document.validateRange(new Range(line, 0, line, endOfLineIndex));
-            }
-            else {
-                const endIndex = document.lineAt(line).firstNonWhitespaceCharacterIndex;
-                hover.range = new Range(line, 0, line, endIndex);
            }

-            if (cfg.heatmap.enabled) {
-                Annotations.applyHeatmap(hover, commit.date, now);
+            if (decorations.length) {
+                this.editor.setDecorations(this.decoration!, decorations);
            }

-            decorations.push(hover);
+            const duration = process.hrtime(start);
+            Logger.log(`${(duration[0] * 1000) + Math.floor(duration[1] / 1000000)} ms to compute hover blame annotations`);
        }

-        if (decorations.length) {
-            this.editor.setDecorations(this.decoration!, decorations);
-        }
-
-        // console.timeEnd('Computing blame annotations...');
-
+        this.registerHoverProvider();
        this.selection(shaOrLine, blame);
        return true;
    }
--- a/src/annotations/recentChangesAnnotationProvider.ts
+++ b/src/annotations/recentChangesAnnotationProvider.ts
@@ -4,6 +4,7 @@ import { Annotations, endOfLineIndex } from './annotations';
 import { FileAnnotationType } from './annotationController';
 import { AnnotationProviderBase } from './annotationProvider';
 import { GitService, GitUri } from '../gitService';
+import { Logger } from '../logger';

 export class RecentChangesAnnotationProvider extends AnnotationProviderBase {

@@ -20,6 +21,8 @@ export class RecentChangesAnnotationProvider extends AnnotationProviderBase {
        const diff = await this.git.getDiffForFile(this.uri, commit.previousSha);
        if (diff === undefined) return false;

+        const start = process.hrtime();
+
        const cfg = this._config.annotations.file.recentChanges;
        const dateFormat = this._config.defaultDateFormat;

@@ -34,16 +37,11 @@ export class RecentChangesAnnotationProvider extends AnnotationProviderBase {

                if (line.state === 'unchanged') continue;

-                let endingIndex = 0;
-                if (cfg.hover.details || cfg.hover.changes) {
-                    endingIndex = cfg.hover.wholeLine ? endOfLineIndex : this.editor.document.lineAt(count).firstNonWhitespaceCharacterIndex;
-                }
-
-                const range = this.editor.document.validateRange(new Range(new Position(count, 0), new Position(count, endingIndex)));
+                const range = this.editor.document.validateRange(new Range(new Position(count, 0), new Position(count, endOfLineIndex)));

                if (cfg.hover.details) {
                    decorators.push({
-                        hoverMessage: Annotations.getHoverMessage(commit, dateFormat),
+                        hoverMessage: Annotations.getHoverMessage(commit, dateFormat, this.git.hasRemotes(commit.repoPath)),
                        range: range
                    } as DecorationOptions);
                }
@@ -62,6 +60,9 @@ export class RecentChangesAnnotationProvider extends AnnotationProviderBase {

        this.editor.setDecorations(this.highlightDecoration!, decorators);

+        const duration = process.hrtime(start);
+        Logger.log(`${(duration[0] * 1000) + Math.floor(duration[1] / 1000000)} ms to compute recent changes annotations`);
+
        return true;
    }

--- a/src/commands/openCommitInRemote.ts
+++ b/src/commands/openCommitInRemote.ts
@@ -12,6 +12,15 @@ export interface OpenCommitInRemoteCommandArgs {

 export class OpenCommitInRemoteCommand extends ActiveEditorCommand {

+    static getMarkdownCommandArgs(sha: string): string;
+    static getMarkdownCommandArgs(args: OpenCommitInRemoteCommandArgs): string;
+    static getMarkdownCommandArgs(argsOrSha: OpenCommitInRemoteCommandArgs | string): string {
+        const args = typeof argsOrSha === 'string'
+            ? { sha: argsOrSha }
+            : argsOrSha;
+        return super.getMarkdownCommandArgsCore<OpenCommitInRemoteCommandArgs>(Commands.OpenCommitInRemote, args);
+    }
+
    constructor(private git: GitService) {
        super(Commands.OpenCommitInRemote);
    }
--- a/src/configuration.ts
+++ b/src/configuration.ts
@@ -251,7 +251,6 @@ export interface IConfig {
                hover: {
                    details: boolean;
                    changes: boolean;
-                    wholeLine: boolean;
                };
            };
        };
@@ -318,12 +317,15 @@ export interface IConfig {
    defaultDateFormat: string | null;

    gitExplorer: {
+        enabled: boolean;
        view: GitExplorerView;
+        includeWorkingTree: boolean;
        showTrackingBranch: boolean;
        commitFormat: string;
        commitFileFormat: string;
        stashFormat: string;
        stashFileFormat: string;
+        statusFileFormat: string;
        // dateFormat: string | null;
    };

--- a/src/constants.ts
+++ b/src/constants.ts
@@ -80,10 +80,13 @@ export type GlyphChars = '\u21a9' |
    '\u2192' |
    '\u21e8' |
    '\u2191' |
+    '\u2197' |
+    '\u2217' |
    '\u2713' |
    '\u2014' |
    '\u2022' |
    '\u2026' |
+    '\u270E' |
    '\u00a0' |
    '\u200b';
 export const GlyphChars = {
@@ -95,15 +98,23 @@ export const GlyphChars = {
    ArrowRight: '\u2192' as GlyphChars,
    ArrowRightHollow: '\u21e8' as GlyphChars,
    ArrowUp: '\u2191' as GlyphChars,
+    ArrowUpRight: '\u2197' as GlyphChars,
+    Asterisk: '\u2217' as GlyphChars,
    Check: '\u2713' as GlyphChars,
    Dash: '\u2014' as GlyphChars,
    Dot: '\u2022' as GlyphChars,
    Ellipsis: '\u2026' as GlyphChars,
+    Pensil: '\u270E' as GlyphChars,
    Space: '\u00a0' as GlyphChars,
    ZeroWidthSpace: '\u200b' as GlyphChars
 };

-export type WorkspaceState = 'gitlensVersion';
+export type GlobalState = 'gitlensVersion';
+export const GlobalState = {
+    GitLensVersion: 'gitlensVersion' as GlobalState
+};
+
+export type WorkspaceState = 'gitlens:gitExplorer:view';
 export const WorkspaceState = {
-    GitLensVersion: 'gitlensVersion' as WorkspaceState
+    GitExplorerView: 'gitlens:gitExplorer:view' as WorkspaceState
 };
--- a/src/currentLineController.ts
+++ b/src/currentLineController.ts
@@ -295,12 +295,10 @@ export class CurrentLineController extends Disposable {
        const decorationOptions: DecorationOptions[] = [];

        let showChanges = false;
-        let showChangesStartIndex = 0;
-        let showChangesInStartingWhitespace = false;
-
        let showDetails = false;
-        let showDetailsStartIndex = 0;
-        let showDetailsInStartingWhitespace = false;
+
+        let showAtStart = false;
+        let showStartIndex = 0;

        switch (state.annotationType) {
            case LineAnnotationType.Trailing: {
@@ -308,21 +306,7 @@ export class CurrentLineController extends Disposable {

                showChanges = cfgAnnotations.hover.changes;
                showDetails = cfgAnnotations.hover.details;
-
-                if (cfgAnnotations.hover.wholeLine) {
-                    showChangesStartIndex = 0;
-                    showChangesInStartingWhitespace = false;
-
-                    showDetailsStartIndex = 0;
-                    showDetailsInStartingWhitespace = false;
-                }
-                else {
-                    showChangesStartIndex = endOfLineIndex;
-                    showChangesInStartingWhitespace = true;
-
-                    showDetailsStartIndex = endOfLineIndex;
-                    showDetailsInStartingWhitespace = true;
-                }
+                showStartIndex = cfgAnnotations.hover.wholeLine ? 0 : endOfLineIndex;

                const decoration = Annotations.trailing(commit, cfgAnnotations.format, cfgAnnotations.dateFormat === null ? this._config.defaultDateFormat : cfgAnnotations.dateFormat, this._config.theme);
                decoration.range = editor.document.validateRange(new Range(line, endOfLineIndex, line, endOfLineIndex));
@@ -334,12 +318,8 @@ export class CurrentLineController extends Disposable {
                const cfgAnnotations = this._config.annotations.line.hover;

                showChanges = cfgAnnotations.changes;
-                showChangesStartIndex = 0;
-                showChangesInStartingWhitespace = false;
-
                showDetails = cfgAnnotations.details;
-                showDetailsStartIndex = 0;
-                showDetailsInStartingWhitespace = false;
+                showStartIndex = 0;

                break;
            }
@@ -348,25 +328,15 @@ export class CurrentLineController extends Disposable {
        if (showDetails || showChanges) {
            const annotationType = this.annotationController.getAnnotationType(editor);

-            const firstNonWhitespace = editor.document.lineAt(line).firstNonWhitespaceCharacterIndex;
-
            switch (annotationType) {
                case FileAnnotationType.Gutter: {
                    const cfgHover = this._config.annotations.file.gutter.hover;
                    if (cfgHover.details) {
-                        showDetailsInStartingWhitespace = false;
                        if (cfgHover.wholeLine) {
-                            // Avoid double annotations if we are showing the whole-file hover blame annotations
-                            showDetails = false;
+                            showStartIndex = 0;
                        }
-                        else {
-                            if (showDetailsStartIndex === 0) {
-                                showDetailsStartIndex = firstNonWhitespace === 0 ? 1 : firstNonWhitespace;
-                            }
-                            if (showChangesStartIndex === 0) {
-                                showChangesInStartingWhitespace = true;
-                                showChangesStartIndex = firstNonWhitespace === 0 ? 1 : firstNonWhitespace;
-                            }
+                        else if (showStartIndex !== 0) {
+                            showAtStart = true;
                        }
                    }

@@ -374,20 +344,11 @@ export class CurrentLineController extends Disposable {
                }
                case FileAnnotationType.Hover: {
                    const cfgHover = this._config.annotations.file.hover;
-                    showDetailsInStartingWhitespace = false;
                    if (cfgHover.wholeLine) {
-                        // Avoid double annotations if we are showing the whole-file hover blame annotations
-                        showDetails = false;
-                        showChangesStartIndex = 0;
+                        showStartIndex = 0;
                    }
-                    else {
-                        if (showDetailsStartIndex === 0) {
-                            showDetailsStartIndex = firstNonWhitespace === 0 ? 1 : firstNonWhitespace;
-                        }
-                        if (showChangesStartIndex === 0) {
-                            showChangesInStartingWhitespace = true;
-                            showChangesStartIndex = firstNonWhitespace === 0 ? 1 : firstNonWhitespace;
-                        }
+                    else if (showStartIndex !== 0) {
+                        showAtStart = true;
                    }

                    break;
@@ -395,29 +356,21 @@ export class CurrentLineController extends Disposable {
                case FileAnnotationType.RecentChanges: {
                    const cfgChanges = this._config.annotations.file.recentChanges.hover;
                    if (cfgChanges.details) {
-                        if (cfgChanges.wholeLine) {
-                            // Avoid double annotations if we are showing the whole-file hover blame annotations
-                            showDetails = false;
-                        }
-                        else {
-                            showDetailsInStartingWhitespace = false;
-                        }
+                        // Avoid double annotations if we are showing the whole-file hover blame annotations
+                        showDetails = false;
                    }

                    if (cfgChanges.changes) {
-                        if (cfgChanges.wholeLine) {
-                            // Avoid double annotations if we are showing the whole-file hover blame annotations
-                            showChanges = false;
-                        }
-                        else {
-                            showChangesInStartingWhitespace = false;
-                        }
+                        // Avoid double annotations if we are showing the whole-file hover blame annotations
+                        showChanges = false;
                    }

                    break;
                }
            }

+            const range = editor.document.validateRange(new Range(line, showStartIndex, line, endOfLineIndex));
+
            if (showDetails) {
                // Get the full commit message -- since blame only returns the summary
                let logCommit: GitCommit | undefined = undefined;
@@ -425,29 +378,22 @@ export class CurrentLineController extends Disposable {
                    logCommit = await this.git.getLogCommit(this._uri.repoPath, this._uri.fsPath, commit.sha);
                }

-                // I have no idea why I need this protection -- but it happens
-                if (editor.document === undefined) return;
-
-                const decoration = Annotations.detailsHover(logCommit || commit, this._config.defaultDateFormat);
-                decoration.range = editor.document.validateRange(new Range(line, showDetailsStartIndex, line, endOfLineIndex));
+                const decoration = Annotations.detailsHover(logCommit || commit, this._config.defaultDateFormat, this.git.hasRemotes((logCommit || commit).repoPath));
+                decoration.range = range;
                decorationOptions.push(decoration);

-                if (showDetailsInStartingWhitespace && showDetailsStartIndex !== 0 && decoration.range.end.character !== 0) {
-                    decorationOptions.push(Annotations.withRange(decoration, 0, firstNonWhitespace));
+                if (showAtStart) {
+                    decorationOptions.push(Annotations.withRange(decoration, 0, 0));
                }
            }

            if (showChanges) {
                const decoration = await Annotations.changesHover(commit, line, this._uri, this.git);
-
-                // I have no idea why I need this protection -- but it happens
-                if (editor.document === undefined) return;
-
-                decoration.range = editor.document.validateRange(new Range(line, showChangesStartIndex, line, endOfLineIndex));
+                decoration.range = range;
                decorationOptions.push(decoration);

-                if (showChangesInStartingWhitespace && showChangesStartIndex !== 0 && decoration.range.end.character !== 0) {
-                    decorationOptions.push(Annotations.withRange(decoration, 0, firstNonWhitespace));
+                if (showAtStart) {
+                    decorationOptions.push(Annotations.withRange(decoration, 0, 0));
                }
            }
        }
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -16,7 +16,7 @@ import { ShowQuickRepoStatusCommand, ShowQuickStashListCommand } from './command
 import { StashApplyCommand, StashDeleteCommand, StashSaveCommand } from './commands';
 import { ToggleCodeLensCommand } from './commands';
 import { CodeLensLocations, IConfig, LineHighlightLocations } from './configuration';
-import { ApplicationInsightsKey, CommandContext, ExtensionKey, QualifiedExtensionId, setCommandContext, WorkspaceState } from './constants';
+import { ApplicationInsightsKey, CommandContext, ExtensionKey, GlobalState, QualifiedExtensionId, setCommandContext } from './constants';
 import { CodeLensController } from './codeLensController';
 import { CurrentLineController, LineAnnotationType } from './currentLineController';
 import { RemoteProviderFactory } from './git/remotes/factory';
@@ -71,7 +71,7 @@ export async function activate(context: ExtensionContext) {
    notifyOnUnsupportedGitVersion(context, gitVersion);
    notifyOnNewGitLensVersion(context, gitlensVersion);

-    await context.globalState.update(WorkspaceState.GitLensVersion, gitlensVersion);
+    await context.globalState.update(GlobalState.GitLensVersion, gitlensVersion);

    const git = new GitService(repoPath);
    context.subscriptions.push(git);
@@ -148,7 +148,7 @@ export async function activate(context: ExtensionContext) {
 export function deactivate() { }

 async function migrateSettings(context: ExtensionContext) {
-    const previousVersion = context.globalState.get<string>(WorkspaceState.GitLensVersion);
+    const previousVersion = context.globalState.get<string>(GlobalState.GitLensVersion);
    if (previousVersion === undefined) return;

    const [major] = previousVersion.split('.');
@@ -274,7 +274,7 @@ async function migrateSettings(context: ExtensionContext) {
 async function notifyOnNewGitLensVersion(context: ExtensionContext, version: string) {
    if (context.globalState.get(SuppressedKeys.UpdateNotice, false)) return;

-    const previousVersion = context.globalState.get<string>(WorkspaceState.GitLensVersion);
+    const previousVersion = context.globalState.get<string>(GlobalState.GitLensVersion);

    if (previousVersion === undefined) {
        Logger.log(`GitLens first-time install`);
--- a/src/git/formatters/commit.ts
+++ b/src/git/formatters/commit.ts
@@ -2,7 +2,6 @@
 import { Strings } from '../../system';
 import { GitCommit } from '../models/commit';
 import { Formatter, IFormatOptions } from './formatter';
-import * as moment from 'moment';
 import { GlyphChars } from '../../constants';

 export interface ICommitFormatOptions extends IFormatOptions {
@@ -20,7 +19,7 @@ export interface ICommitFormatOptions extends IFormatOptions {
 export class CommitFormatter extends Formatter<GitCommit, ICommitFormatOptions> {

    get ago() {
-        const ago = moment(this._item.date).fromNow();
+        const ago = this._item.fromNow();
        return this._padOrTruncate(ago, this._options.tokenOptions!.ago);
    }

@@ -30,17 +29,17 @@ export class CommitFormatter extends Formatter<GitCommit, ICommitFormatOptions>
    }

    get authorAgo() {
-        const authorAgo = `${this._item.author}, ${moment(this._item.date).fromNow()}`;
+        const authorAgo = `${this._item.author}, ${this._item.fromNow()}`;
        return this._padOrTruncate(authorAgo, this._options.tokenOptions!.authorAgo);
    }

    get date() {
-        const date = moment(this._item.date).format(this._options.dateFormat!);
+        const date = this._item.formatDate(this._options.dateFormat!);
        return this._padOrTruncate(date, this._options.tokenOptions!.date);
    }

    get id() {
-        return this._item.shortSha;
+        return this._item.isUncommitted ? 'index' : this._item.shortSha;
    }

    get message() {
--- a/src/git/formatters/formatter.ts
+++ b/src/git/formatters/formatter.ts
@@ -51,7 +51,7 @@ export abstract class Formatter<TItem = any, TOptions extends IFormatOptions = I

        let max = options.truncateTo;

-        const width = Strings.getWidth(s);
+        const width = Strings.width(s);
        if (max === undefined) {
            if (this.collapsableWhitespace === 0) return s;

--- a/src/git/formatters/status.ts
+++ b/src/git/formatters/status.ts
@@ -1,7 +1,8 @@
 'use strict';
 import { Strings } from '../../system';
+import { GlyphChars } from '../../constants';
 import { Formatter, IFormatOptions } from './formatter';
-import { GitStatusFile, IGitStatusFile } from '../models/status';
+import { GitStatusFile, IGitStatusFile, IGitStatusFileWithCommit } from '../models/status';
 import * as path from 'path';

 export interface IStatusFormatOptions extends IFormatOptions {
@@ -29,6 +30,11 @@ export class StatusFileFormatter extends Formatter<IGitStatusFile, IStatusFormat
        return this._padOrTruncate(directory, this._options.tokenOptions!.file);
    }

+    get working() {
+        const commit = (this._item as IGitStatusFileWithCommit).commit;
+        return (commit !== undefined && commit.isUncommitted) ? `${GlyphChars.Pensil} ${GlyphChars.Space}` : '';
+    }
+
    static fromTemplate(template: string, status: IGitStatusFile, dateFormat: string | null): string;
    static fromTemplate(template: string, status: IGitStatusFile, options?: IStatusFormatOptions): string;
    static fromTemplate(template: string, status: IGitStatusFile, dateFormatOrOptions?: string | null | IStatusFormatOptions): string;
--- a/src/git/git.ts
+++ b/src/git/git.ts
@@ -21,9 +21,9 @@ export * from './remotes/provider';

 let git: IGit;

-// `--format=%H -%nauthor %an%nauthor-date %ai%ncommitter %cn%ncommitter-date %ci%nparents %P%nsummary %B%nfilename ?`
-const defaultLogParams = [`log`, `--name-status`, `--full-history`, `-M`, `--date=iso8601`, `--format=%H -%nauthor %an%nauthor-date %ai%nparents %P%nsummary %B%nfilename ?`];
-const defaultStashParams = [`stash`, `list`, `--name-status`, `--full-history`, `-M`, `--format=%H -%nauthor-date %ai%nreflog-selector %gd%nsummary %B%nfilename ?`];
+const defaultBlameParams = [`blame`, `--root`, `--incremental`];
+const defaultLogParams = [`log`, `--name-status`, `--full-history`, `-M`, `--format=%H -%nauthor %an%nauthor-date %at%nparents %P%nsummary %B%nfilename ?`];
+const defaultStashParams = [`stash`, `list`, `--name-status`, `--full-history`, `-M`, `--format=%H -%nauthor-date %at%nreflog-selector %gd%nsummary %B%nfilename ?`];

 let defaultEncoding = 'utf8';
 export function setDefaultEncoding(encoding: string) {
@@ -180,7 +180,7 @@ export class Git {
    static blame(repoPath: string | undefined, fileName: string, sha?: string, options: { ignoreWhitespace?: boolean, startLine?: number, endLine?: number } = {}) {
        const [file, root] = Git.splitPath(fileName, repoPath);

-        const params = [`blame`, `--root`, `--incremental`];
+        const params = [...defaultBlameParams];

        if (options.ignoreWhitespace) {
            params.push('-w');
@@ -259,6 +259,14 @@ export class Git {
        return gitCommand({ cwd: repoPath }, ...params);
    }

+    static diff_shortstat(repoPath: string, sha?: string) {
+        const params = [`diff`, `--shortstat`, `--no-ext-diff`];
+        if (sha) {
+            params.push(sha);
+        }
+        return gitCommand({ cwd: repoPath }, ...params);
+    }
+
    static difftool_dirDiff(repoPath: string, sha1: string, sha2?: string) {
        const params = [`difftool`, `--dir-diff`, sha1];
        if (sha2) {
@@ -332,6 +340,14 @@ export class Git {
        return gitCommand({ cwd: repoPath }, ...params, ...search);
    }

+    static log_shortstat(repoPath: string, sha?: string) {
+        const params = [`log`, `--shortstat`, `--oneline`];
+        if (sha) {
+            params.push(sha);
+        }
+        return gitCommand({ cwd: repoPath }, ...params);
+    }
+
    static async ls_files(repoPath: string, fileName: string): Promise<string> {
        try {
            return await gitCommand({ cwd: repoPath, overrideErrorHandling: true }, 'ls-files', fileName);
--- a/src/git/gitUri.ts
+++ b/src/git/gitUri.ts
@@ -42,7 +42,7 @@ export class GitUri extends Uri {
            }
            else {
                const commit = commitOrRepoPath;
-                base._fsPath = path.resolve(commit.repoPath, commit.originalFileName || commit.fileName);
+                base._fsPath = path.resolve(commit.repoPath, commit.originalFileName || commit.fileName || '');

                if (commit.repoPath !== undefined) {
                    this.repoPath = commit.repoPath;
--- a/src/git/models/commit.ts
+++ b/src/git/models/commit.ts
@@ -1,5 +1,5 @@
 'use strict';
-import { Strings } from '../../system';
+import { Dates, Strings } from '../../system';
 import { Uri } from 'vscode';
 import { GlyphChars } from '../../constants';
 import { Git } from '../git';
@@ -70,7 +70,23 @@ export class GitCommit {
    }

    get uri(): Uri {
-        return Uri.file(path.resolve(this.repoPath, this.originalFileName || this.fileName));
+        return Uri.file(path.resolve(this.repoPath, this.originalFileName || this.fileName || ''));
+    }
+
+    private _dateFormatter?: Dates.IDateFormatter;
+
+    formatDate(format: string) {
+        if (this._dateFormatter === undefined) {
+            this._dateFormatter = Dates.toFormatter(this.date);
+        }
+        return this._dateFormatter.format(format);
+    }
+
+    fromNow() {
+        if (this._dateFormatter === undefined) {
+            this._dateFormatter = Dates.toFormatter(this.date);
+        }
+        return this._dateFormatter.fromNow();
    }

    getFormattedPath(separator: string = Strings.pad(GlyphChars.Dot, 2, 2)): string {
--- a/src/git/models/diff.ts
+++ b/src/git/models/diff.ts
@@ -33,4 +33,10 @@ export interface GitDiff {
    chunks: GitDiffChunk[];

    diff?: string;
+}
+
+export interface GitDiffShortStat {
+    files: number;
+    insertions: number;
+    deletions: number;
 }
--- a/src/git/models/logCommit.ts
+++ b/src/git/models/logCommit.ts
@@ -40,7 +40,12 @@ export class GitLogCommit extends GitCommit {
            this.status = fileStatus.status;
        }
        else {
-            this.fileStatuses = [{ status: status, fileName: fileName, originalFileName: originalFileName } as IGitStatusFile];
+            if (fileName === undefined) {
+                this.fileStatuses = [];
+            }
+            else {
+                this.fileStatuses = [{ status: status, fileName: fileName, originalFileName: originalFileName } as IGitStatusFile];
+            }
            this.status = status;
        }
    }
--- a/src/git/models/status.ts
+++ b/src/git/models/status.ts
@@ -3,6 +3,7 @@ import { Strings } from '../../system';
 import { Uri } from 'vscode';
 import { GlyphChars } from '../../constants';
 import { GitUri } from '../gitUri';
+import { GitLogCommit } from './logCommit';
 import * as path from 'path';

 export interface GitStatus {
@@ -19,7 +20,7 @@ export interface GitStatus {
    files: GitStatusFile[];
 }

-export declare type GitStatusFileStatus = '!' | '?' | 'A' | 'C' | 'D' | 'M' | 'R' | 'U';
+export declare type GitStatusFileStatus = '!' | '?' | 'A' | 'C' | 'D' | 'M' | 'R' | 'T' | 'U' | 'X' | 'B';

 export interface IGitStatusFile {
    status: GitStatusFileStatus;
@@ -27,6 +28,10 @@ export interface IGitStatusFile {
    originalFileName?: string;
 }

+export interface IGitStatusFileWithCommit extends IGitStatusFile {
+    commit: GitLogCommit;
+}
+
 export class GitStatusFile implements IGitStatusFile {

    originalFileName?: string;
@@ -71,7 +76,10 @@ const statusOcticonsMap = {
    D: '$(diff-removed)',
    M: '$(diff-modified)',
    R: '$(diff-renamed)',
-    U: '$(question)'
+    T: '$(diff-modified)',
+    U: '$(alert)',
+    X: '$(question)',
+    B: '$(question)'
 };

 export function getGitStatusOcticon(status: GitStatusFileStatus, missing: string = GlyphChars.Space.repeat(4)): string {
@@ -86,7 +94,10 @@ const statusIconsMap = {
    D: 'icon-status-deleted.svg',
    M: 'icon-status-modified.svg',
    R: 'icon-status-renamed.svg',
-    U: 'icon-status-conflict.svg'
+    T: 'icon-status-modified.svg',
+    U: 'icon-status-conflict.svg',
+    X: 'icon-status-unknown.svg',
+    B: 'icon-status-unknown.svg'
 };

 export function getGitStatusIcon(status: GitStatusFileStatus): string {
--- a/src/git/parsers/blameParser.ts
+++ b/src/git/parsers/blameParser.ts
@@ -1,7 +1,6 @@
 'use strict';
 import { Strings } from '../../system';
 import { Git, GitAuthor, GitBlame, GitBlameCommit, GitCommitLine } from './../git';
-import * as moment from 'moment';
 import * as path from 'path';

 interface BlameEntry {
@@ -134,7 +133,7 @@ export class GitBlameParser {
                }
            }

-            commit = new GitBlameCommit(repoPath!, entry.sha, fileName!, entry.author, moment(`${entry.authorDate} ${entry.authorTimeZone}`, 'X +-HHmm').toDate(), entry.summary!, []);
+            commit = new GitBlameCommit(repoPath!, entry.sha, fileName!, entry.author, new Date(entry.authorDate as any * 1000), entry.summary!, []);

            if (fileName !== entry.fileName) {
                commit.originalFileName = entry.fileName;
--- a/src/git/parsers/diffParser.ts
+++ b/src/git/parsers/diffParser.ts
@@ -1,8 +1,9 @@
 'use strict';
 import { Iterables, Strings } from '../../system';
-import { GitDiff, GitDiffChunk, GitDiffChunkLine, GitDiffLine } from './../git';
+import { GitDiff, GitDiffChunk, GitDiffChunkLine, GitDiffLine, GitDiffShortStat } from './../git';

 const unifiedDiffRegex = /^@@ -([\d]+),([\d]+) [+]([\d]+),([\d]+) @@([\s\S]*?)(?=^@@)/gm;
+const shortStatDiffRegex = /^\s*(\d+)\sfiles? changed(?:,\s+(\d+)\s+insertions?\(\+\))?(?:,\s+(\d+)\s+deletions?\(-\))?/;

 export class GitDiffParser {

@@ -116,4 +117,20 @@ export class GitDiffParser {

        return chunkLines;
    }
+
+    static parseShortStat(data: string): GitDiffShortStat | undefined {
+        if (!data) return undefined;
+
+        const match = shortStatDiffRegex.exec(data);
+        if (match == null) return undefined;
+
+        const files = match[1];
+        const insertions = match[2];
+        const deletions = match[3];
+        return {
+            files: files == null ? 0 : parseInt(files, 10),
+            insertions: insertions == null ? 0 : parseInt(insertions, 10),
+            deletions: deletions == null ? 0 : parseInt(deletions, 10)
+        } as GitDiffShortStat;
+    }
 }
--- a/src/git/parsers/logParser.ts
+++ b/src/git/parsers/logParser.ts
@@ -3,7 +3,6 @@ import { Strings } from '../../system';
 import { Range } from 'vscode';
 import { Git, GitAuthor, GitCommitType, GitLog, GitLogCommit, GitStatusFileStatus, IGitStatusFile } from './../git';
 // import { Logger } from '../../logger';
-import * as moment from 'moment';
 import * as path from 'path';

 interface LogEntry {
@@ -87,7 +86,7 @@ export class GitLogParser {
                    break;

                case 'author-date':
-                    entry.authorDate = `${lineParts[1]}T${lineParts[2]}${lineParts[3]}`;
+                    entry.authorDate = lineParts[1];
                    break;

                case 'parents':
@@ -231,7 +230,7 @@ export class GitLogParser {
                }
            }

-            commit = new GitLogCommit(type, repoPath!, entry.sha, relativeFileName, entry.author, moment(entry.authorDate).toDate(), entry.summary!, entry.status, entry.fileStatuses, undefined, entry.originalFileName);
+            commit = new GitLogCommit(type, repoPath!, entry.sha, relativeFileName, entry.author, new Date(entry.authorDate! as any * 1000), entry.summary!, entry.status, entry.fileStatuses, undefined, entry.originalFileName);
            commit.parentShas = entry.parentShas!;

            if (relativeFileName !== entry.fileName) {
--- a/src/git/parsers/stashParser.ts
+++ b/src/git/parsers/stashParser.ts
@@ -1,7 +1,6 @@
 'use strict';
 import { Git, GitStash, GitStashCommit, GitStatusFileStatus, IGitStatusFile } from './../git';
 // import { Logger } from '../../logger';
-import * as moment from 'moment';

 interface StashEntry {
    sha: string;
@@ -14,11 +13,33 @@ interface StashEntry {

 export class GitStashParser {

+    static parse(data: string, repoPath: string): GitStash | undefined {
+        const entries = this._parseEntries(data);
+        if (entries === undefined) return undefined;
+
+        const commits: Map<string, GitStashCommit> = new Map();
+
+        for (let i = 0, len = entries.length; i < len; i++) {
+            const entry = entries[i];
+
+            let commit = commits.get(entry.sha);
+            if (commit === undefined) {
+                commit = new GitStashCommit(entry.stashName, repoPath, entry.sha, entry.fileNames, new Date(entry.date! as any * 1000), entry.summary, undefined, entry.fileStatuses) as GitStashCommit;
+                commits.set(entry.sha, commit);
+            }
+        }
+
+        return {
+            repoPath: repoPath,
+            commits: commits
+        } as GitStash;
+    }
+
    private static _parseEntries(data: string): StashEntry[] | undefined {
        if (!data) return undefined;

        const lines = data.split('\n');
-        if (!lines.length) return undefined;
+        if (lines.length === 0) return undefined;

        const entries: StashEntry[] = [];

@@ -42,7 +63,7 @@ export class GitStashParser {

            switch (lineParts[0]) {
                case 'author-date':
-                    entry.date = `${lineParts[1]}T${lineParts[2]}${lineParts[3]}`;
+                    entry.date = lineParts[1];
                    break;

                case 'summary':
@@ -66,7 +87,12 @@ export class GitStashParser {
                case 'filename':
                    const nextLine = lines[position + 1];
                    // If the next line isn't blank, make sure it isn't starting a new commit
-                    if (nextLine && Git.shaRegex.test(nextLine)) continue;
+                    if (nextLine && Git.shaRegex.test(nextLine)) {
+                        entries.push(entry);
+                        entry = undefined;
+
+                        continue;
+                    }

                    position++;

@@ -109,28 +135,6 @@ export class GitStashParser {
        return entries;
    }

-    static parse(data: string, repoPath: string): GitStash | undefined {
-        const entries = this._parseEntries(data);
-        if (entries === undefined) return undefined;
-
-        const commits: Map<string, GitStashCommit> = new Map();
-
-        for (let i = 0, len = entries.length; i < len; i++) {
-            const entry = entries[i];
-
-            let commit = commits.get(entry.sha);
-            if (commit === undefined) {
-                commit = new GitStashCommit(entry.stashName, repoPath, entry.sha, entry.fileNames, moment(entry.date).toDate(), entry.summary, undefined, entry.fileStatuses) as GitStashCommit;
-                commits.set(entry.sha, commit);
-            }
-        }
-
-        return {
-            repoPath: repoPath,
-            commits: commits
-        } as GitStash;
-    }
-
    private static _parseFileName(entry: { fileName?: string, originalFileName?: string }) {
        if (entry.fileName === undefined) return;

--- a/src/git/parsers/statusParser.ts
+++ b/src/git/parsers/statusParser.ts
@@ -17,7 +17,7 @@ export class GitStatusParser {
        if (!data) return undefined;

        const lines = data.split('\n').filter(_ => !!_);
-        if (!lines.length) return undefined;
+        if (lines.length === 0) return undefined;

        const status = {
            branch: '',
--- a/src/git/remotes/gitlab.ts
+++ b/src/git/remotes/gitlab.ts
@@ -1,7 +1,8 @@
 'use strict';
-import { GitHubService } from './github';
+import { Range } from 'vscode';
+import { RemoteProvider } from './provider';

-export class GitLabService extends GitHubService {
+export class GitLabService extends RemoteProvider {

    constructor(public domain: string, public path: string, public custom: boolean = false) {
        super(domain, path);
@@ -10,4 +11,32 @@ export class GitLabService extends GitHubService {
    get name() {
        return this.formatName('GitLab');
    }
+
+    protected getUrlForBranches(): string {
+        return `${this.baseUrl}/branches`;
+    }
+
+    protected getUrlForBranch(branch: string): string {
+        return `${this.baseUrl}/commits/${branch}`;
+    }
+
+    protected getUrlForCommit(sha: string): string {
+        return `${this.baseUrl}/commit/${sha}`;
+    }
+
+    protected getUrlForFile(fileName: string, branch?: string, sha?: string, range?: Range): string {
+        let line = '';
+        if (range) {
+            if (range.start.line === range.end.line) {
+                line = `#L${range.start.line}`;
+            }
+            else {
+                line = `#L${range.start.line}-${range.end.line}`;
+            }
+        }
+
+        if (sha) return `${this.baseUrl}/blob/${sha}/${fileName}${line}`;
+        if (branch) return `${this.baseUrl}/blob/${branch}/${fileName}${line}`;
+        return `${this.baseUrl}?path=${fileName}${line}`;
+    }
 }
--- a/src/gitCodeLensProvider.ts
+++ b/src/gitCodeLensProvider.ts
@@ -6,7 +6,6 @@ import { BuiltInCommands, DocumentSchemes, ExtensionKey } from './constants';
 import { CodeLensCommand, CodeLensLocations, ICodeLensLanguageLocation, IConfig } from './configuration';
 import { GitBlame, GitBlameCommit, GitBlameLines, GitService, GitUri } from './gitService';
 import { Logger } from './logger';
-import * as moment from 'moment';

 export class GitRecentChangeCodeLens extends CodeLens {

@@ -254,7 +253,7 @@ export class GitCodeLensProvider implements CodeLensProvider {
        if (blame === undefined) return lens;

        const recentCommit = Iterables.first(blame.commits.values());
-        title = `${recentCommit.author}, ${moment(recentCommit.date).fromNow()}`;
+        title = `${recentCommit.author}, ${recentCommit.fromNow()}`;
        if (this._config.codeLens.debug) {
            title += ` [${SymbolKind[lens.symbolKind]}(${lens.range.start.character}-${lens.range.end.character}), Lines (${lens.blameRange.start.line + 1}-${lens.blameRange.end.line + 1}), Commit (${recentCommit.shortSha})]`;
        }
--- a/src/gitService.ts
+++ b/src/gitService.ts
@@ -4,12 +4,11 @@ import { Disposable, Event, EventEmitter, FileSystemWatcher, Location, Position,
 import { IConfig } from './configuration';
 import { DocumentSchemes, ExtensionKey, GlyphChars } from './constants';
 import { RemoteProviderFactory } from './git/remotes/factory';
-import { Git, GitAuthor, GitBlame, GitBlameCommit, GitBlameLine, GitBlameLines, GitBlameParser, GitBranch, GitBranchParser, GitCommit, GitDiff, GitDiffChunkLine, GitDiffParser, GitLog, GitLogCommit, GitLogParser, GitRemote, GitRemoteParser, GitStash, GitStashParser, GitStatus, GitStatusFile, GitStatusParser, IGit, setDefaultEncoding } from './git/git';
+import { Git, GitAuthor, GitBlame, GitBlameCommit, GitBlameLine, GitBlameLines, GitBlameParser, GitBranch, GitBranchParser, GitCommit, GitDiff, GitDiffChunkLine, GitDiffParser, GitDiffShortStat, GitLog, GitLogCommit, GitLogParser, GitRemote, GitRemoteParser, GitStash, GitStashParser, GitStatus, GitStatusFile, GitStatusParser, IGit, setDefaultEncoding } from './git/git';
 import { GitUri, IGitCommitInfo, IGitUriData } from './git/gitUri';
 import { Logger } from './logger';
 import * as fs from 'fs';
 import * as ignore from 'ignore';
-import * as moment from 'moment';
 import * as path from 'path';

 export { GitUri, IGitCommitInfo };
@@ -75,6 +74,7 @@ export const RepoChangedReasons = {
 export class GitService extends Disposable {

    static fakeSha = 'ffffffffffffffffffffffffffffffffffffffff';
+    static uncommittedSha = '0000000000000000000000000000000000000000';

    private _onDidBlameFail = new EventEmitter<string>();
    get onDidBlameFail(): Event<string> {
@@ -86,6 +86,11 @@ export class GitService extends Disposable {
        return this._onDidChangeGitCache.event;
    }

+    private _onDidChangeFileSystem = new EventEmitter<Uri>();
+    get onDidChangeFileSystem(): Event<Uri> {
+        return this._onDidChangeFileSystem.event;
+    }
+
    private _onDidChangeRepo = new EventEmitter<RepoChangedReasons[]>();
    get onDidChangeRepo(): Event<RepoChangedReasons[]> {
        return this._onDidChangeRepo.event;
@@ -121,14 +126,16 @@ export class GitService extends Disposable {
    }

    dispose() {
+        this.stopWatchingFileSystem();
+
+        this._repoWatcher && this._repoWatcher.dispose();
+        this._repoWatcher = undefined;
+
        this._disposable && this._disposable.dispose();

        this._cacheDisposable && this._cacheDisposable.dispose();
        this._cacheDisposable = undefined;

-        this._repoWatcher && this._repoWatcher.dispose();
-        this._repoWatcher = undefined;
-
        this._gitCache.clear();
        this._remotesCache.clear();
        this._uriCache.clear();
@@ -156,6 +163,8 @@ export class GitService extends Disposable {
                disposables.push(workspace.onDidChangeTextDocument(this._onTextDocumentChanged, this));
                disposables.push(workspace.onDidSaveTextDocument(d => this._removeCachedEntry(d, RemoveCacheReason.DocumentSaved)));
                disposables.push(this._repoWatcher.onDidChange(this._onRepoChanged, this));
+                disposables.push(this._repoWatcher.onDidCreate(this._onRepoChanged, this));
+                disposables.push(this._repoWatcher.onDidDelete(this._onRepoChanged, this));

                this._cacheDisposable = Disposable.from(...disposables);
            }
@@ -167,7 +176,6 @@ export class GitService extends Disposable {
                this._repoWatcher = undefined;

                this._gitCache.clear();
-                this._remotesCache.clear();
            }

            this._gitignore = new Promise<ignore.Ignore | undefined>((resolve, reject) => {
@@ -568,7 +576,7 @@ export class GitService extends Disposable {
        Iterables.forEach(blame.commits.values(), (c, i) => {
            if (c.isUncommitted) return;

-            const decoration = `${GlyphChars.ArrowDropRight} ${c.author}, ${moment(c.date).format(dateFormat)}`;
+            const decoration = `${GlyphChars.ArrowDropRight} ${c.author}, ${c.formatDate(dateFormat)}`;
            const uri = GitService.toReferenceGitContentUri(c, i + 1, commitCount, c.originalFileName, decoration, dateFormat);
            locations.push(new Location(uri, new Position(0, 0)));
            if (c.sha === selectedSha) {
@@ -600,6 +608,11 @@ export class GitService extends Disposable {
        return Git.normalizePath(typeof fileNameOrUri === 'string' ? fileNameOrUri : fileNameOrUri.fsPath).toLowerCase();
    }

+    async getChangedFilesCount(repoPath: string, sha?: string): Promise<GitDiffShortStat | undefined> {
+        const data = await Git.diff_shortstat(repoPath, sha);
+        return GitDiffParser.parseShortStat(data);
+    }
+
    async getConfig(key: string, repoPath?: string): Promise<string> {
        Logger.log(`getConfig('${key}', '${repoPath}')`);

@@ -888,7 +901,7 @@ export class GitService extends Disposable {
        Iterables.forEach(log.commits.values(), (c, i) => {
            if (c.isUncommitted) return;

-            const decoration = `${GlyphChars.ArrowDropRight} ${c.author}, ${moment(c.date).format(dateFormat)}`;
+            const decoration = `${GlyphChars.ArrowDropRight} ${c.author}, ${c.formatDate(dateFormat)}`;
            const uri = GitService.toReferenceGitContentUri(c, i + 1, commitCount, c.originalFileName, decoration, dateFormat);
            locations.push(new Location(uri, new Position(0, 0)));
            if (c.sha === selectedSha) {
@@ -899,21 +912,26 @@ export class GitService extends Disposable {
        return locations;
    }

+    hasRemotes(repoPath: string): boolean {
+        const remotes = this._remotesCache.get(repoPath);
+        return remotes !== undefined && remotes.length > 0;
+    }
+
    async getRemotes(repoPath: string): Promise<GitRemote[]> {
        if (!repoPath) return [];

        Logger.log(`getRemotes('${repoPath}')`);

-        if (this.UseCaching) {
-            const remotes = this._remotesCache.get(repoPath);
-            if (remotes !== undefined) return remotes;
-        }
+        let remotes = this._remotesCache.get(repoPath);
+        if (remotes !== undefined) return remotes;

        const data = await Git.remote(repoPath);
-        const remotes = GitRemoteParser.parse(data, repoPath);
-        if (this.UseCaching) {
+        remotes = GitRemoteParser.parse(data, repoPath);
+
+        if (remotes !== undefined) {
            this._remotesCache.set(repoPath, remotes);
        }
+
        return remotes;
    }

@@ -1024,6 +1042,33 @@ export class GitService extends Disposable {
        return Git.difftool_dirDiff(repoPath, sha1, sha2);
    }

+    private _fsWatcherDisposable: Disposable | undefined;
+
+    startWatchingFileSystem() {
+        if (this._fsWatcherDisposable !== undefined) return;
+
+        const debouncedFn = Functions.debounce((uri: Uri) => this._onDidChangeFileSystem.fire(uri), 2500);
+        const fn = (uri: Uri) => {
+            // Ignore .git changes
+            if (/\.git/.test(uri.fsPath)) return;
+
+            debouncedFn(uri);
+        };
+
+        const watcher = workspace.createFileSystemWatcher(`**`);
+        this._fsWatcherDisposable = Disposable.from(
+            watcher,
+            watcher.onDidChange(fn),
+            watcher.onDidCreate(fn),
+            watcher.onDidDelete(fn)
+        );
+    }
+
+    stopWatchingFileSystem() {
+        this._fsWatcherDisposable && this._fsWatcherDisposable.dispose();
+        this._fsWatcherDisposable = undefined;
+    }
+
    stashApply(repoPath: string, stashName: string, deleteAfter: boolean = false) {
        Logger.log(`stashApply('${repoPath}', ${stashName}, ${deleteAfter})`);

@@ -1138,7 +1183,7 @@ export class GitService extends Disposable {
        }

        // NOTE: Need to specify an index here, since I can't control the sort order -- just alphabetic or by file location
-        return Uri.parse(`${scheme}:${pad(data.index || 0)} ${GlyphChars.Dot} ${encodeURIComponent(message)} ${GlyphChars.Dot} ${moment(commit.date).format(dateFormat)} ${GlyphChars.Dot} ${encodeURIComponent(uriPath)}?${JSON.stringify(data)}`);
+        return Uri.parse(`${scheme}:${pad(data.index || 0)} ${GlyphChars.Dot} ${encodeURIComponent(message)} ${GlyphChars.Dot} ${commit.formatDate(dateFormat)} ${GlyphChars.Dot} ${encodeURIComponent(uriPath)}?${JSON.stringify(data)}`);
    }

    private static _toGitUriData<T extends IGitUriData>(commit: IGitUriData, index?: number, originalFileName?: string, decoration?: string): T {
--- a/src/messages.ts
+++ b/src/messages.ts
@@ -3,7 +3,6 @@ import { commands, ExtensionContext, Uri, window } from 'vscode';
 import { BuiltInCommands } from './constants';
 import { GitCommit } from './gitService';
 import { Logger } from './logger';
-import * as moment from 'moment';

 export type SuppressedKeys = 'suppressCommitHasNoPreviousCommitWarning' |
    'suppressCommitNotFoundWarning' |
@@ -34,7 +33,7 @@ export class Messages {

    static showCommitHasNoPreviousCommitWarningMessage(commit?: GitCommit): Promise<string | undefined> {
        if (commit === undefined) return Messages._showMessage('info', `Commit has no previous commit`, SuppressedKeys.CommitHasNoPreviousCommitWarning);
-        return Messages._showMessage('info', `Commit ${commit.shortSha} (${commit.author}, ${moment(commit.date).fromNow()}) has no previous commit`, SuppressedKeys.CommitHasNoPreviousCommitWarning);
+        return Messages._showMessage('info', `Commit ${commit.shortSha} (${commit.author}, ${commit.fromNow()}) has no previous commit`, SuppressedKeys.CommitHasNoPreviousCommitWarning);
    }

    static showCommitNotFoundWarningMessage(message: string): Promise<string | undefined> {
--- a/src/quickPicks/commitDetails.ts
+++ b/src/quickPicks/commitDetails.ts
@@ -7,7 +7,6 @@ import { GlyphChars } from '../constants';
 import { getGitStatusOcticon, GitCommit, GitLog, GitLogCommit, GitService, GitStashCommit, GitStatusFile, GitStatusFileStatus, GitUri, IGitCommitInfo, IGitStatusFile, RemoteResource } from '../gitService';
 import { Keyboard, KeyCommand, KeyNoopCommand, Keys } from '../keyboard';
 import { OpenRemotesCommandQuickPickItem } from './remotes';
-import * as moment from 'moment';
 import * as path from 'path';

 export class CommitWithFileStatusQuickPickItem extends OpenFileCommandQuickPickItem {
@@ -299,7 +298,7 @@ export class CommitDetailsQuickPick {
        const pick = await window.showQuickPick(items, {
            matchOnDescription: true,
            matchOnDetail: true,
-            placeHolder: `${commit.shortSha} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.author ? `${commit.author}, ` : ''}${moment(commit.date).fromNow()} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.message}`,
+            placeHolder: `${commit.shortSha} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.author ? `${commit.author}, ` : ''}${commit.fromNow()} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.message}`,
            ignoreFocusOut: getQuickPickIgnoreFocusOut(),
            onDidSelectItem: (item: QuickPickItem) => {
                scope.setKeyCommand('right', item);
--- a/src/quickPicks/commitFileDetails.ts
+++ b/src/quickPicks/commitFileDetails.ts
@@ -7,7 +7,6 @@ import { GlyphChars } from '../constants';
 import { GitLog, GitLogCommit, GitService, GitUri, RemoteResource } from '../gitService';
 import { Keyboard, KeyCommand, KeyNoopCommand } from '../keyboard';
 import { OpenRemotesCommandQuickPickItem } from './remotes';
-import * as moment from 'moment';
 import * as path from 'path';

 export class OpenCommitFileCommandQuickPickItem extends OpenFileCommandQuickPickItem {
@@ -275,7 +274,7 @@ export class CommitFileDetailsQuickPick {

        const pick = await window.showQuickPick(items, {
            matchOnDescription: true,
-            placeHolder: `${commit.getFormattedPath()} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${isUncommitted ? `Uncommitted ${GlyphChars.ArrowRightHollow} ` : '' }${commit.shortSha} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.author}, ${moment(commit.date).fromNow()} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.message}`,
+            placeHolder: `${commit.getFormattedPath()} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${isUncommitted ? `Uncommitted ${GlyphChars.ArrowRightHollow} ` : '' }${commit.shortSha} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.author}, ${commit.fromNow()} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.message}`,
            ignoreFocusOut: getQuickPickIgnoreFocusOut(),
            onDidSelectItem: (item: QuickPickItem) => {
                scope.setKeyCommand('right', item as KeyCommand);
--- a/src/quickPicks/common.ts
+++ b/src/quickPicks/common.ts
@@ -7,7 +7,6 @@ import { GlyphChars } from '../constants';
 import { GitCommit, GitLogCommit, GitStashCommit } from '../gitService';
 import { Keyboard, KeyboardScope, KeyMapping, Keys } from '../keyboard';
 // import { Logger } from '../logger';
-import * as moment from 'moment';

 export function getQuickPickIgnoreFocusOut() {
    const cfg = workspace.getConfiguration(ExtensionKey).get<IAdvancedConfig>('advanced')!;
@@ -174,12 +173,12 @@ export class CommitQuickPickItem implements QuickPickItem {
        if (commit instanceof GitStashCommit) {
            this.label = message;
            this.description = '';
-            this.detail = `${GlyphChars.Space} ${commit.stashName} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${moment(commit.date).fromNow()} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.getDiffStatus()}`;
+            this.detail = `${GlyphChars.Space} ${commit.stashName} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.fromNow()} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.getDiffStatus()}`;
        }
        else {
            this.label = message;
            this.description = `${Strings.pad('$(git-commit)', 1, 1)} ${commit.shortSha}`;
-            this.detail = `${GlyphChars.Space} ${commit.author}, ${moment(commit.date).fromNow()}${(commit.type === 'branch') ? ` ${Strings.pad(GlyphChars.Dot, 1, 1)} ${(commit as GitLogCommit).getDiffStatus()}` : ''}`;
+            this.detail = `${GlyphChars.Space} ${commit.author}, ${commit.fromNow()}${(commit.type === 'branch') ? ` ${Strings.pad(GlyphChars.Dot, 1, 1)} ${(commit as GitLogCommit).getDiffStatus()}` : ''}`;
        }
    }
 }
--- a/src/system.ts
+++ b/src/system.ts
@@ -1,5 +1,6 @@
 'use strict';
 export * from './system/array';
+export * from './system/date';
 // export * from './system/disposable';
 // export * from './system/element';
 // export * from './system/event';
--- a/src/system/array.ts
+++ b/src/system/array.ts
@@ -1,7 +1,7 @@
 'use strict';

 export namespace Arrays {
-    export function groupBy<T>(array: T[], accessor: (item: T) => any): T[] {
+    export function groupBy<T>(array: T[], accessor: (item: T) => string): { [key: string]: T[] } {
        return array.reduce((previous, current) => {
            const value = accessor(current);
            previous[value] = previous[value] || [];
--- a/src/system/date.ts
+++ b/src/system/date.ts
@@ -0,0 +1,33 @@
+'use strict';
+import * as moment from 'moment';
+
+const MillisecondsPerMinute = 60000; // 60 * 1000
+const MillisecondsPerDay = 86400000; // 24 * 60 * 60 * 1000
+
+export namespace Dates {
+
+    export interface IDateFormatter {
+        fromNow: () => string;
+        format: (format: string) => string;
+    }
+
+    export function dateDaysFromNow(date: Date, now: number = Date.now()) {
+        const startOfDayLeft = startOfDay(now);
+        const startOfDayRight = startOfDay(date);
+
+        const timestampLeft = startOfDayLeft.getTime() - startOfDayLeft.getTimezoneOffset() * MillisecondsPerMinute;
+        const timestampRight = startOfDayRight.getTime() - startOfDayRight.getTimezoneOffset() * MillisecondsPerMinute;
+
+        return Math.round((timestampLeft - timestampRight) / MillisecondsPerDay);
+    }
+
+    export function startOfDay(date: Date | number) {
+        const newDate = new Date(typeof date === 'number' ? date : date.getTime());
+        newDate.setHours(0, 0, 0, 0);
+        return newDate;
+    }
+
+    export function toFormatter(date: Date): IDateFormatter {
+        return moment(date);
+    }
+}
--- a/src/system/string.ts
+++ b/src/system/string.ts
@@ -1,16 +1,11 @@
 'use strict';
 const _escapeRegExp = require('lodash.escaperegexp');
-const stringWidth = require('string-width');

 export namespace Strings {
    export function escapeRegExp(s: string): string {
        return _escapeRegExp(s);
    }

-    export function getWidth(s: string): number {
-        return stringWidth(s);
-    }
-
    const TokenRegex = /\$\{([^|]*?)(?:\|(\d+)(\-|\?)?)?\}/g;
    const TokenSanitizeRegex = /\$\{(\w*?)(?:\W|\d)*?\}/g;

@@ -68,19 +63,19 @@ export namespace Strings {
    }

    export function padLeft(s: string, padTo: number, padding: string = '\u00a0') {
-        const diff = padTo - getWidth(s);
+        const diff = padTo - width(s);
        return (diff <= 0) ? s : '\u00a0'.repeat(diff) + s;
    }

    export function padLeftOrTruncate(s: string, max: number, padding?: string) {
-        const len = getWidth(s);
+        const len = width(s);
        if (len < max) return padLeft(s, max, padding);
        if (len > max) return truncate(s, max);
        return s;
    }

    export function padRight(s: string, padTo: number, padding: string = '\u00a0') {
-        const diff = padTo - getWidth(s);
+        const diff = padTo - width(s);
        return (diff <= 0) ? s : s + '\u00a0'.repeat(diff);
    }

@@ -88,14 +83,14 @@ export namespace Strings {
        const left = max < 0;
        max = Math.abs(max);

-        const len = getWidth(s);
+        const len = width(s);
        if (len < max) return left ? padLeft(s, max, padding) : padRight(s, max, padding);
        if (len > max) return truncate(s, max);
        return s;
    }

    export function padRightOrTruncate(s: string, max: number, padding?: string) {
-        const len = getWidth(s);
+        const len = width(s);
        if (len < max) return padRight(s, max, padding);
        if (len > max) return truncate(s, max);
        return s;
@@ -112,15 +107,15 @@ export namespace Strings {
    export function truncate(s: string, truncateTo: number, ellipsis: string = '\u2026') {
        if (!s) return s;

-        const len = getWidth(s);
+        const len = width(s);
        if (len <= truncateTo) return s;
        if (len === s.length) return `${s.substring(0, truncateTo - 1)}${ellipsis}`;

        // Skip ahead to start as far as we can by assuming all the double-width characters won't be truncated
        let chars = Math.floor(truncateTo / (len / s.length));
-        let count = getWidth(s.substring(0, chars));
+        let count = width(s.substring(0, chars));
        while (count < truncateTo) {
-            count += getWidth(s[chars++]);
+            count += width(s[chars++]);
        }

        if (count >= truncateTo) {
@@ -129,4 +124,107 @@ export namespace Strings {

        return `${s.substring(0, chars)}${ellipsis}`;
    }
+
+    const ansiRegex = /[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))/g;
+
+    export function width(s: string): number {
+        if (!s || s.length === 0) return 0;
+
+        s = s.replace(ansiRegex, '');
+
+        let count = 0;
+        let emoji = 0;
+        let joiners = 0;
+
+        const graphemes = [...s];
+        for (let i = 0; i < graphemes.length; i++) {
+            const code = graphemes[i].codePointAt(0)!;
+
+            // Ignore control characters
+            if (code <= 0x1F || (code >= 0x7F && code <= 0x9F)) continue;
+
+            // Ignore combining characters
+            if (code >= 0x300 && code <= 0x36F) continue;
+
+            // https://stackoverflow.com/questions/30757193/find-out-if-character-in-string-is-emoji
+            if (
+                (code >= 0x1F600 && code <= 0x1F64F) || // Emoticons
+                (code >= 0x1F300 && code <= 0x1F5FF) || // Misc Symbols and Pictographs
+                (code >= 0x1F680 && code <= 0x1F6FF) || // Transport and Map
+                (code >= 0x2600 && code <= 0x26FF) ||   // Misc symbols
+                (code >= 0x2700 && code <= 0x27BF) ||   // Dingbats
+                (code >= 0xFE00 && code <= 0xFE0F) ||   // Variation Selectors
+                (code >= 0x1F900 && code <= 0x1F9FF) || // Supplemental Symbols and Pictographs
+                (code >= 65024 && code <= 65039) ||     // Variation selector
+                (code >= 8400 && code <= 8447)          // Combining Diacritical Marks for Symbols
+            ) {
+                if (code >= 0x1F3FB && code <= 0x1F3FF) continue; // emoji modifier fitzpatrick type
+
+                emoji++;
+                count += 2;
+                continue;
+            }
+
+            // Ignore zero-width joiners '\u200d'
+            if (code === 8205) {
+                joiners++;
+                count -= 2;
+                continue;
+            }
+
+            // Surrogates
+            if (code > 0xFFFF) {
+                i++;
+            }
+
+            count += isFullwidthCodePoint(code) ? 2 : 1;
+        }
+
+        const offset = emoji - joiners;
+        if (offset > 1) {
+            count += offset - 1;
+        }
+        return count;
+    }
+
+    function isFullwidthCodePoint(cp: number) {
+        // code points are derived from:
+        // http://www.unix.org/Public/UNIDATA/EastAsianWidth.txt
+        if (
+            cp >= 0x1100 && (
+                cp <= 0x115f ||  // Hangul Jamo
+                cp === 0x2329 || // LEFT-POINTING ANGLE BRACKET
+                cp === 0x232a || // RIGHT-POINTING ANGLE BRACKET
+                // CJK Radicals Supplement .. Enclosed CJK Letters and Months
+                (0x2e80 <= cp && cp <= 0x3247 && cp !== 0x303f) ||
+                // Enclosed CJK Letters and Months .. CJK Unified Ideographs Extension A
+                (0x3250 <= cp && cp <= 0x4dbf) ||
+                // CJK Unified Ideographs .. Yi Radicals
+                (0x4e00 <= cp && cp <= 0xa4c6) ||
+                // Hangul Jamo Extended-A
+                (0xa960 <= cp && cp <= 0xa97c) ||
+                // Hangul Syllables
+                (0xac00 <= cp && cp <= 0xd7a3) ||
+                // CJK Compatibility Ideographs
+                (0xf900 <= cp && cp <= 0xfaff) ||
+                // Vertical Forms
+                (0xfe10 <= cp && cp <= 0xfe19) ||
+                // CJK Compatibility Forms .. Small Form Variants
+                (0xfe30 <= cp && cp <= 0xfe6b) ||
+                // Halfwidth and Fullwidth Forms
+                (0xff01 <= cp && cp <= 0xff60) ||
+                (0xffe0 <= cp && cp <= 0xffe6) ||
+                // Kana Supplement
+                (0x1b000 <= cp && cp <= 0x1b001) ||
+                // Enclosed Ideographic Supplement
+                (0x1f200 <= cp && cp <= 0x1f251) ||
+                // CJK Unified Ideographs Extension B .. Tertiary Ideographic Plane
+                (0x20000 <= cp && cp <= 0x3fffd)
+            )
+        ) {
+            return true;
+        }
+
+        return false;
+    }
 }
--- a/src/views/branchHistoryNode.ts
+++ b/src/views/branchHistoryNode.ts
@@ -3,7 +3,7 @@ import { Iterables } from '../system';
 import { ExtensionContext, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { CommitNode } from './commitNode';
 import { GlyphChars } from '../constants';
-import { ExplorerNode, ResourceType, ShowAllCommitsNode } from './explorerNode';
+import { ExplorerNode, ResourceType, ShowAllNode } from './explorerNode';
 import { GitBranch, GitService, GitUri } from '../gitService';

 export class BranchHistoryNode extends ExplorerNode {
@@ -12,7 +12,12 @@ export class BranchHistoryNode extends ExplorerNode {

        maxCount: number | undefined = undefined;

-        constructor(public readonly branch: GitBranch, uri: GitUri, private readonly template: string, protected readonly context: ExtensionContext, protected readonly git: GitService) {
+        constructor(
+            public readonly branch: GitBranch,
+            uri: GitUri,
+            protected readonly context: ExtensionContext,
+            protected readonly git: GitService
+        ) {
            super(uri);
        }

@@ -20,10 +25,11 @@ export class BranchHistoryNode extends ExplorerNode {
            const log = await this.git.getLogForRepo(this.uri.repoPath!, this.branch.name, this.maxCount);
            if (log === undefined) return [];

-            const children = Iterables.map(log.commits.values(), c => new CommitNode(c, this.template, this.context, this.git, this.branch));
-            if (!log.truncated) return [...children];
-
-            return [...children, new ShowAllCommitsNode(this, this.context)];
+            const children: (CommitNode | ShowAllNode)[] = [...Iterables.map(log.commits.values(), c => new CommitNode(c, this.context, this.git, this.branch))];
+            if (log.truncated) {
+                children.push(new ShowAllNode('Show All Commits', this, this.context));
+            }
+            return children;
        }

        async getTreeItem(): Promise<TreeItem> {
--- a/src/views/branchesNode.ts
+++ b/src/views/branchesNode.ts
@@ -9,7 +9,11 @@ export class BranchesNode extends ExplorerNode {

        readonly resourceType: ResourceType = 'gitlens:branches';

-        constructor(uri: GitUri, protected readonly context: ExtensionContext, protected readonly git: GitService) {
+        constructor(
+            uri: GitUri,
+            protected readonly context: ExtensionContext,
+            protected readonly git: GitService
+        ) {
            super(uri);
        }

@@ -18,7 +22,7 @@ export class BranchesNode extends ExplorerNode {
            if (branches === undefined) return [];

            branches.sort((a, b) => (a.current ? -1 : 1) - (b.current ? -1 : 1) || a.name.localeCompare(b.name));
-            return [...Iterables.filterMap(branches, b => b.remote ? undefined : new BranchHistoryNode(b, this.uri, this.git.config.gitExplorer.commitFormat, this.context, this.git))];
+            return [...Iterables.filterMap(branches, b => b.remote ? undefined : new BranchHistoryNode(b, this.uri, this.context, this.git))];
        }

        async getTreeItem(): Promise<TreeItem> {
--- a/src/views/commitFileNode.ts
+++ b/src/views/commitFileNode.ts
@@ -2,19 +2,36 @@
 import { Command, ExtensionContext, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode';
 import { Commands, DiffWithPreviousCommandArgs } from '../commands';
 import { ExplorerNode, ResourceType } from './explorerNode';
-import { getGitStatusIcon, GitBranch, GitCommit, GitService, GitUri, IGitStatusFile, StatusFileFormatter } from '../gitService';
+import { CommitFormatter, getGitStatusIcon, GitBranch, GitCommit, GitService, GitUri, ICommitFormatOptions, IGitStatusFile, StatusFileFormatter } from '../gitService';
 import * as path from 'path';

+export enum CommitFileNodeDisplayAs {
+    CommitLabel = 1 << 0,
+    CommitIcon = 1 << 1,
+    FileLabel = 1 << 2,
+    StatusIcon = 1 << 3,
+
+    Commit = CommitLabel | CommitIcon,
+    File = FileLabel | StatusIcon
+}
+
 export class CommitFileNode extends ExplorerNode {

    readonly resourceType: ResourceType = 'gitlens:commit-file';

-    constructor(public readonly status: IGitStatusFile, public commit: GitCommit, protected readonly context: ExtensionContext, protected readonly git: GitService, public readonly branch?: GitBranch) {
+    constructor(
+        public readonly status: IGitStatusFile,
+        public commit: GitCommit,
+        protected readonly context: ExtensionContext,
+        protected readonly git: GitService,
+        private displayAs: CommitFileNodeDisplayAs = CommitFileNodeDisplayAs.Commit,
+        public readonly branch?: GitBranch
+    ) {
        super(new GitUri(Uri.file(path.resolve(commit.repoPath, status.fileName)), { repoPath: commit.repoPath, fileName: status.fileName, sha: commit.sha }));
    }

-    getChildren(): Promise<ExplorerNode[]> {
-        return Promise.resolve([]);
+    async getChildren(): Promise<ExplorerNode[]> {
+        return [];
    }

    async getTreeItem(): Promise<TreeItem> {
@@ -25,10 +42,13 @@ export class CommitFileNode extends ExplorerNode {
            }
        }

-        const item = new TreeItem(StatusFileFormatter.fromTemplate(this.git.config.gitExplorer.commitFileFormat, this.status), TreeItemCollapsibleState.None);
+        const item = new TreeItem(this.label, TreeItemCollapsibleState.None);
        item.contextValue = this.resourceType;

-        const icon = getGitStatusIcon(this.status.status);
+        const icon = (this.displayAs & CommitFileNodeDisplayAs.CommitIcon)
+            ? 'icon-commit.svg'
+            : getGitStatusIcon(this.status.status);
+
        item.iconPath = {
            dark: this.context.asAbsolutePath(path.join('images', 'dark', icon)),
            light: this.context.asAbsolutePath(path.join('images', 'light', icon))
@@ -36,9 +56,33 @@ export class CommitFileNode extends ExplorerNode {

        item.command = this.getCommand();

+        // Only cache the label for a single refresh
+        this._label = undefined;
+
        return item;
    }

+    private _label: string | undefined;
+    get label() {
+        if (this._label === undefined) {
+            this._label = (this.displayAs & CommitFileNodeDisplayAs.CommitLabel)
+                ? CommitFormatter.fromTemplate(this.getCommitTemplate(), this.commit, {
+                    truncateMessageAtNewLine: true,
+                    dataFormat: this.git.config.defaultDateFormat
+                } as ICommitFormatOptions)
+                : StatusFileFormatter.fromTemplate(this.getCommitFileTemplate(), this.status);
+        }
+        return this._label;
+    }
+
+    protected getCommitTemplate() {
+        return this.git.config.gitExplorer.commitFormat;
+    }
+
+    protected getCommitFileTemplate() {
+        return this.git.config.gitExplorer.commitFileFormat;
+    }
+
    getCommand(): Command | undefined {
        return {
            title: 'Compare File with Previous Revision',
--- a/src/views/commitNode.ts
+++ b/src/views/commitNode.ts
@@ -2,58 +2,46 @@
 import { Iterables } from '../system';
 import { Command, ExtensionContext, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { Commands, DiffWithPreviousCommandArgs } from '../commands';
-import { CommitFileNode } from './commitFileNode';
+import { CommitFileNode, CommitFileNodeDisplayAs } from './commitFileNode';
 import { ExplorerNode, ResourceType } from './explorerNode';
-import { CommitFormatter, getGitStatusIcon, GitBranch, GitLogCommit, GitService, GitUri, ICommitFormatOptions } from '../gitService';
-import * as path from 'path';
+import { CommitFormatter, GitBranch, GitLogCommit, GitService, GitUri, ICommitFormatOptions } from '../gitService';

 export class CommitNode extends ExplorerNode {

    readonly resourceType: ResourceType = 'gitlens:commit';

-    constructor(public readonly commit: GitLogCommit, private readonly template: string, protected readonly context: ExtensionContext, protected readonly git: GitService, public readonly branch?: GitBranch) {
+    constructor(
+        public readonly commit: GitLogCommit,
+        protected readonly context: ExtensionContext,
+        protected readonly git: GitService,
+        public readonly branch?: GitBranch
+    ) {
        super(new GitUri(commit.uri, commit));
    }

    async getChildren(): Promise<ExplorerNode[]> {
-        if (this.commit.type === 'file') Promise.resolve([]);
-
        const log = await this.git.getLogForRepo(this.commit.repoPath, this.commit.sha, 1);
        if (log === undefined) return [];

        const commit = Iterables.first(log.commits.values());
        if (commit === undefined) return [];

-        return [...Iterables.map(commit.fileStatuses, s => new CommitFileNode(s, commit, this.context, this.git, this.branch))];
+        const children = [...Iterables.map(commit.fileStatuses, s => new CommitFileNode(s, commit, this.context, this.git, CommitFileNodeDisplayAs.File, this.branch))];
+        children.sort((a, b) => a.label!.localeCompare(b.label!));
+        return children;
    }

    getTreeItem(): TreeItem {
-        const item = new TreeItem(CommitFormatter.fromTemplate(this.template, this.commit, {
+        const item = new TreeItem(CommitFormatter.fromTemplate(this.git.config.gitExplorer.commitFormat, this.commit, {
            truncateMessageAtNewLine: true,
            dataFormat: this.git.config.defaultDateFormat
-        } as ICommitFormatOptions));
+        } as ICommitFormatOptions), TreeItemCollapsibleState.Collapsed);

-        if (this.commit.type === 'file') {
-            item.collapsibleState = TreeItemCollapsibleState.None;
-            item.command = this.getCommand();
-            const resourceType: ResourceType = 'gitlens:commit-file';
-            item.contextValue = resourceType;
-
-            const icon = getGitStatusIcon(this.commit.status!);
-            item.iconPath = {
-                dark: this.context.asAbsolutePath(path.join('images', 'dark', icon)),
-                light: this.context.asAbsolutePath(path.join('images', 'light', icon))
-            };
-        }
-        else {
-            item.collapsibleState = TreeItemCollapsibleState.Collapsed;
-            item.contextValue = this.resourceType;
-
-            item.iconPath = {
-                dark: this.context.asAbsolutePath('images/dark/icon-commit.svg'),
-                light: this.context.asAbsolutePath('images/light/icon-commit.svg')
-            };
-        }
+        item.contextValue = this.resourceType;
+        item.iconPath = {
+            dark: this.context.asAbsolutePath('images/dark/icon-commit.svg'),
+            light: this.context.asAbsolutePath('images/light/icon-commit.svg')
+        };

        return item;
    }
--- a/src/views/explorerNode.ts
+++ b/src/views/explorerNode.ts
@@ -20,6 +20,9 @@ export declare type ResourceType =
    'gitlens:stash-file' |
    'gitlens:stashes' |
    'gitlens:status' |
+    'gitlens:status-file' |
+    'gitlens:status-files' |
+    'gitlens:status-file-commits' |
    'gitlens:status-upstream';

 export abstract class ExplorerNode {
@@ -88,11 +91,11 @@ export class PagerNode extends ExplorerNode {
    }
 }

-export class ShowAllCommitsNode extends PagerNode {
+export class ShowAllNode extends PagerNode {

    args: RefreshNodeCommandArgs = { maxCount: 0 };

-    constructor(node: ExplorerNode, context: ExtensionContext) {
-        super(`Show All Commits ${GlyphChars.Space}${GlyphChars.Dash}${GlyphChars.Space} this may take a while`, node, context);
+    constructor(message: string, node: ExplorerNode, context: ExtensionContext) {
+        super(`${message} ${GlyphChars.Space}${GlyphChars.Dash}${GlyphChars.Space} this may take a while`, node, context);
    }
 }
--- a/src/views/explorerNodes.ts
+++ b/src/views/explorerNodes.ts
@@ -10,8 +10,10 @@ export * from './historyNode';
 export * from './remoteNode';
 export * from './remotesNode';
 export * from './repositoryNode';
+export * from './stashesNode';
 export * from './stashFileNode';
 export * from './stashNode';
-export * from './stashesNode';
+export * from './statusFileCommitsNode';
+export * from './statusFilesNode';
 export * from './statusNode';
 export * from './statusUpstreamNode';
--- a/src/views/fileHistoryNode.ts
+++ b/src/views/fileHistoryNode.ts
@@ -1,7 +1,7 @@
 'use strict';
 import { Iterables } from '../system';
 import { ExtensionContext, TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { CommitNode } from './commitNode';
+import { CommitFileNode, CommitFileNodeDisplayAs } from './commitFileNode';
 import { ExplorerNode, MessageNode, ResourceType } from './explorerNode';
 import { GitService, GitUri } from '../gitService';

@@ -9,15 +9,19 @@ export class FileHistoryNode extends ExplorerNode {

    readonly resourceType: ResourceType = 'gitlens:file-history';

-    constructor(uri: GitUri, protected readonly context: ExtensionContext, protected readonly git: GitService) {
+    constructor(
+        uri: GitUri,
+        protected readonly context: ExtensionContext,
+        protected readonly git: GitService
+    ) {
        super(uri);
-     }
+    }

    async getChildren(): Promise<ExplorerNode[]> {
        const log = await this.git.getLogForFile(this.uri.repoPath, this.uri.fsPath, this.uri.sha);
        if (log === undefined) return [new MessageNode('No file history')];

-        return [...Iterables.map(log.commits.values(), c => new CommitNode(c, this.git.config.gitExplorer.commitFormat, this.context, this.git))];
+        return [...Iterables.map(log.commits.values(), c => new CommitFileNode(c.fileStatuses[0], c, this.context, this.git, CommitFileNodeDisplayAs.CommitLabel | CommitFileNodeDisplayAs.StatusIcon))];
    }

    getTreeItem(): TreeItem {
--- a/src/views/gitExplorer.ts
+++ b/src/views/gitExplorer.ts
@@ -4,16 +4,18 @@ import { commands, Event, EventEmitter, ExtensionContext, TextDocumentShowOption
 import { Commands, DiffWithCommandArgs, DiffWithCommandArgsRevision, DiffWithPreviousCommandArgs, DiffWithWorkingCommandArgs, openEditor, OpenFileInRemoteCommandArgs } from '../commands';
 import { UriComparer } from '../comparers';
 import { ExtensionKey, IConfig } from '../configuration';
-import { CommandContext, setCommandContext } from '../constants';
+import { CommandContext, setCommandContext, WorkspaceState } from '../constants';
 import { BranchHistoryNode, CommitFileNode, CommitNode, ExplorerNode, HistoryNode, MessageNode, RepositoryNode, StashNode } from './explorerNodes';
 import { GitService, GitUri, RepoChangedReasons } from '../gitService';

 export * from './explorerNodes';

 export type GitExplorerView =
+    'auto' |
    'history' |
    'repository';
 export const GitExplorerView = {
+    Auto: 'auto' as GitExplorerView,
    History: 'history' as GitExplorerView,
    Repository: 'repository' as GitExplorerView
 };
@@ -31,7 +33,7 @@ export class GitExplorer implements TreeDataProvider<ExplorerNode> {

    private _config: IConfig;
    private _root?: ExplorerNode;
-    private _view: GitExplorerView = GitExplorerView.Repository;
+    private _view: GitExplorerView | undefined;

    private _onDidChangeTreeData = new EventEmitter<ExplorerNode>();
    public get onDidChangeTreeData(): Event<ExplorerNode> {
@@ -62,10 +64,6 @@ export class GitExplorer implements TreeDataProvider<ExplorerNode> {
        context.subscriptions.push(workspace.onDidChangeConfiguration(this.onConfigurationChanged, this));

        this.onConfigurationChanged();
-
-        this._view = this._config.gitExplorer.view;
-        setCommandContext(CommandContext.GitExplorerView, this._view);
-        this._root = this.getRootNode();
    }

    async getTreeItem(node: ExplorerNode): Promise<TreeItem> {
@@ -83,14 +81,14 @@ export class GitExplorer implements TreeDataProvider<ExplorerNode> {
    }

    private getRootNode(editor?: TextEditor): ExplorerNode | undefined {
-        const uri = new GitUri(Uri.file(this.git.repoPath), { repoPath: this.git.repoPath, fileName: this.git.repoPath });
-
        switch (this._view) {
-            case GitExplorerView.History: return this.getHistoryNode(editor || window.activeTextEditor);
-            case GitExplorerView.Repository: return new RepositoryNode(uri, this.context, this.git);
-        }
+            case GitExplorerView.History:
+                return this.getHistoryNode(editor || window.activeTextEditor);

-        return undefined;
+            default:
+                const uri = new GitUri(Uri.file(this.git.repoPath), { repoPath: this.git.repoPath, fileName: this.git.repoPath });
+                return new RepositoryNode(uri, this.context, this.git);
+        }
    }

    private getHistoryNode(editor: TextEditor | undefined): ExplorerNode | undefined {
@@ -116,15 +114,21 @@ export class GitExplorer implements TreeDataProvider<ExplorerNode> {
    private onConfigurationChanged() {
        const cfg = workspace.getConfiguration().get<IConfig>(ExtensionKey)!;

-        if (!Objects.areEquivalent(cfg.gitExplorer, this._config && this._config.gitExplorer)) {
-            setTimeout(() => {
-                this._root = this.getRootNode(window.activeTextEditor);
-                this.refresh();
-            }, 1);
-        }
+        const changed = !Objects.areEquivalent(cfg.gitExplorer, this._config && this._config.gitExplorer);

        this._config = cfg;
-    }
+
+        if (changed) {
+            let view = cfg.gitExplorer.view;
+            if (view === GitExplorerView.Auto) {
+                view = this.context.workspaceState.get<GitExplorerView>(WorkspaceState.GitExplorerView, GitExplorerView.Repository);
+            }
+
+            this.setView(view);
+            this._root = this.getRootNode(window.activeTextEditor);
+            this.refresh();
+        }
+}

    private onRepoChanged(reasons: RepoChangedReasons[]) {
        if (this._view !== GitExplorerView.Repository) return;
@@ -148,12 +152,26 @@ export class GitExplorer implements TreeDataProvider<ExplorerNode> {
        this.refresh(node);
    }

-    switchTo(view: GitExplorerView) {
+    setView(view: GitExplorerView) {
        if (this._view === view) return;

+        if (this._config.gitExplorer.view === GitExplorerView.Auto) {
+            this.context.workspaceState.update(WorkspaceState.GitExplorerView, view);
+        }
+
        this._view = view;
        setCommandContext(CommandContext.GitExplorerView, this._view);

+        if (view !== GitExplorerView.Repository) {
+            this.git.stopWatchingFileSystem();
+        }
+    }
+
+    switchTo(view: GitExplorerView) {
+        if (this._view === view) return;
+
+        this.setView(view);
+
        this._root = this.getRootNode(window.activeTextEditor);
        this.refresh();
    }
--- a/src/views/historyNode.ts
+++ b/src/views/historyNode.ts
@@ -8,9 +8,13 @@ export class HistoryNode extends ExplorerNode {

    readonly resourceType: ResourceType = 'gitlens:history';

-    constructor(uri: GitUri, protected readonly context: ExtensionContext, protected readonly git: GitService) {
+    constructor(
+        uri: GitUri,
+        protected readonly context: ExtensionContext,
+        protected readonly git: GitService
+    ) {
        super(uri);
-     }
+    }

    async getChildren(): Promise<ExplorerNode[]> {
        return [new FileHistoryNode(this.uri, this.context, this.git)];
--- a/src/views/remoteNode.ts
+++ b/src/views/remoteNode.ts
@@ -10,7 +10,12 @@ export class RemoteNode extends ExplorerNode {

        readonly resourceType: ResourceType = 'gitlens:remote';

-        constructor(public readonly remote: GitRemote, uri: GitUri, protected readonly context: ExtensionContext, protected readonly git: GitService) {
+        constructor(
+            public readonly remote: GitRemote,
+            uri: GitUri,
+            protected readonly context: ExtensionContext,
+            protected readonly git: GitService
+        ) {
            super(uri);
        }

@@ -19,7 +24,7 @@ export class RemoteNode extends ExplorerNode {
            if (branches === undefined) return [];

            branches.sort((a, b) => a.name.localeCompare(b.name));
-            return [...Iterables.filterMap(branches, b => !b.remote || !b.name.startsWith(this.remote.name) ? undefined : new BranchHistoryNode(b, this.uri, this.git.config.gitExplorer.commitFormat, this.context, this.git))];
+            return [...Iterables.filterMap(branches, b => !b.remote || !b.name.startsWith(this.remote.name) ? undefined : new BranchHistoryNode(b, this.uri, this.context, this.git))];
        }

        getTreeItem(): TreeItem {
--- a/src/views/remotesNode.ts
+++ b/src/views/remotesNode.ts
@@ -9,7 +9,11 @@ export class RemotesNode extends ExplorerNode {

        readonly resourceType: ResourceType = 'gitlens:remotes';

-        constructor(uri: GitUri, protected readonly context: ExtensionContext, protected readonly git: GitService) {
+        constructor(
+            uri: GitUri,
+            protected readonly context: ExtensionContext,
+            protected readonly git: GitService
+        ) {
            super(uri);
        }

--- a/src/views/repositoryNode.ts
+++ b/src/views/repositoryNode.ts
@@ -12,9 +12,13 @@ export class RepositoryNode extends ExplorerNode {

    readonly resourceType: ResourceType = 'gitlens:repository';

-    constructor(uri: GitUri, protected readonly context: ExtensionContext, protected readonly git: GitService) {
+    constructor(
+        uri: GitUri,
+        protected readonly context: ExtensionContext,
+        protected readonly git: GitService
+    ) {
        super(uri);
-     }
+    }

    async getChildren(): Promise<ExplorerNode[]> {
        return [
--- a/src/views/stashFileNode.ts
+++ b/src/views/stashFileNode.ts
@@ -2,13 +2,26 @@
 import { ExtensionContext } from 'vscode';
 import { ResourceType } from './explorerNode';
 import { GitService, GitStashCommit, IGitStatusFile } from '../gitService';
-import { CommitFileNode } from './commitFileNode';
+import { CommitFileNode, CommitFileNodeDisplayAs } from './commitFileNode';

 export class StashFileNode extends CommitFileNode {

    readonly resourceType: ResourceType = 'gitlens:stash-file';

-    constructor(readonly status: IGitStatusFile, readonly commit: GitStashCommit, readonly context: ExtensionContext, readonly git: GitService) {
-        super(status, commit, context, git);
+    constructor(
+        readonly status: IGitStatusFile,
+        readonly commit: GitStashCommit,
+        readonly context: ExtensionContext,
+        readonly git: GitService
+    ) {
+        super(status, commit, context, git, CommitFileNodeDisplayAs.File);
+    }
+
+    protected getCommitTemplate() {
+        return this.git.config.gitExplorer.stashFormat;
+    }
+
+    protected getCommitFileTemplate() {
+        return this.git.config.gitExplorer.stashFileFormat;
    }
 }
--- a/src/views/stashNode.ts
+++ b/src/views/stashNode.ts
@@ -1,4 +1,5 @@
 'use strict';
+import { Iterables } from '../system';
 import { ExtensionContext, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { ExplorerNode, ResourceType } from './explorerNode';
 import { CommitFormatter, GitService, GitStashCommit, GitUri, ICommitFormatOptions } from '../gitService';
@@ -8,12 +9,31 @@ export class StashNode extends ExplorerNode {

    readonly resourceType: ResourceType = 'gitlens:stash';

-    constructor(public readonly commit: GitStashCommit, protected readonly context: ExtensionContext, protected readonly git: GitService) {
+    constructor(
+        public readonly commit: GitStashCommit,
+        protected readonly context: ExtensionContext,
+        protected readonly git: GitService
+    ) {
        super(new GitUri(commit.uri, commit));
    }

    async getChildren(): Promise<ExplorerNode[]> {
-        return Promise.resolve((this.commit as GitStashCommit).fileStatuses.map(s => new StashFileNode(s, this.commit, this.context, this.git)));
+        const statuses = (this.commit as GitStashCommit).fileStatuses;
+
+        // Check for any untracked files -- since git doesn't return them via `git stash list` :(
+        const log = await this.git.getLogForRepo(this.commit.repoPath, `${(this.commit as GitStashCommit).stashName}^3`, 1);
+        if (log !== undefined) {
+            const commit = Iterables.first(log.commits.values());
+            if (commit !== undefined && commit.fileStatuses.length !== 0) {
+                // Since these files are untracked -- make them look that way
+                commit.fileStatuses.forEach(s => s.status = '?');
+                statuses.splice(statuses.length, 0, ...commit.fileStatuses);
+            }
+        }
+
+        const children = statuses.map(s => new StashFileNode(s, this.commit, this.context, this.git));
+        children.sort((a, b) => a.label!.localeCompare(b.label!));
+        return children;
    }

    getTreeItem(): TreeItem {
--- a/src/views/stashesNode.ts
+++ b/src/views/stashesNode.ts
@@ -9,9 +9,13 @@ export class StashesNode extends ExplorerNode {

    readonly resourceType: ResourceType = 'gitlens:stashes';

-    constructor(uri: GitUri, protected readonly context: ExtensionContext, protected readonly git: GitService) {
+    constructor(
+        uri: GitUri,
+        protected readonly context: ExtensionContext,
+        protected readonly git: GitService
+    ) {
        super(uri);
-     }
+    }

    async getChildren(): Promise<ExplorerNode[]> {
        const stash = await this.git.getStashList(this.uri.repoPath!);
--- a/src/views/statusFileCommitsNode.ts
+++ b/src/views/statusFileCommitsNode.ts
@@ -0,0 +1,79 @@
+'use strict';
+import { Command, ExtensionContext, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode';
+import { Commands, DiffWithPreviousCommandArgs } from '../commands';
+import { CommitFileNode, CommitFileNodeDisplayAs } from './commitFileNode';
+import { ExplorerNode, ResourceType } from './explorerNode';
+import { getGitStatusIcon, GitBranch, GitLogCommit, GitService, GitUri, IGitStatusFile, IGitStatusFileWithCommit, StatusFileFormatter } from '../gitService';
+import * as path from 'path';
+
+export class StatusFileCommitsNode extends ExplorerNode {
+
+    readonly resourceType: ResourceType = 'gitlens:status-file-commits';
+
+    constructor(
+        repoPath: string,
+        public readonly status: IGitStatusFile,
+        public commits: GitLogCommit[],
+        protected readonly context: ExtensionContext,
+        protected readonly git: GitService,
+        public readonly branch?: GitBranch
+    ) {
+        super(new GitUri(Uri.file(path.resolve(repoPath, status.fileName)), { repoPath: repoPath, fileName: status.fileName, sha: 'HEAD' }));
+    }
+
+    async getChildren(): Promise<ExplorerNode[]> {
+        return this.commits.map(c => new CommitFileNode(this.status, c, this.context, this.git, CommitFileNodeDisplayAs.Commit, this.branch));
+    }
+
+    async getTreeItem(): Promise<TreeItem> {
+        const item = new TreeItem(this.label, TreeItemCollapsibleState.Collapsed);
+        item.contextValue = this.resourceType;
+
+        const icon = getGitStatusIcon(this.status.status);
+        item.iconPath = {
+            dark: this.context.asAbsolutePath(path.join('images', 'dark', icon)),
+            light: this.context.asAbsolutePath(path.join('images', 'light', icon))
+        };
+
+        if (this.commits.length === 1 && this.commits[0].isUncommitted) {
+            item.collapsibleState = TreeItemCollapsibleState.None;
+            item.contextValue = 'gitlens:status-file' as ResourceType;
+            item.command = this.getCommand();
+        }
+
+        // Only cache the label for a single refresh
+        this._label = undefined;
+
+        return item;
+    }
+
+    private _label: string | undefined;
+    get label() {
+        if (this._label === undefined) {
+            this._label = StatusFileFormatter.fromTemplate(this.git.config.gitExplorer.statusFileFormat, { ...this.status, commit: this.commit } as IGitStatusFileWithCommit);
+        }
+        return this._label;
+    }
+
+    get commit() {
+        return this.commits[0];
+    }
+
+    getCommand(): Command | undefined {
+        return {
+            title: 'Compare File with Previous Revision',
+            command: Commands.DiffWithPrevious,
+            arguments: [
+                GitUri.fromFileStatus(this.status, this.uri.repoPath!),
+                {
+                    commit: this.commit,
+                    line: 0,
+                    showOptions: {
+                        preserveFocus: true,
+                        preview: true
+                    }
+                } as DiffWithPreviousCommandArgs
+            ]
+        };
+    }
+}
--- a/src/views/statusFilesNode.ts
+++ b/src/views/statusFilesNode.ts
@@ -0,0 +1,86 @@
+'use strict';
+import { Arrays, Iterables, Objects } from '../system';
+import { ExtensionContext, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode';
+import { ExplorerNode, ResourceType, ShowAllNode } from './explorerNode';
+import { GitBranch, GitLog, GitLogCommit, GitService, GitStatus, GitUri, IGitStatusFileWithCommit } from '../gitService';
+import { StatusFileCommitsNode } from './statusFileCommitsNode';
+
+export class StatusFilesNode extends ExplorerNode {
+
+    readonly resourceType: ResourceType = 'gitlens:status-files';
+
+    maxCount: number | undefined = undefined;
+
+    constructor(
+        public readonly status: GitStatus,
+        public readonly range: string | undefined,
+        protected readonly context: ExtensionContext,
+        protected readonly git: GitService,
+        public readonly branch?: GitBranch
+    ) {
+        super(new GitUri(Uri.file(status.repoPath), { repoPath: status.repoPath, fileName: status.repoPath }));
+    }
+
+    async getChildren(): Promise<ExplorerNode[]> {
+        let statuses: IGitStatusFileWithCommit[] = [];
+
+        let log: GitLog | undefined;
+        if (this.range !== undefined) {
+            log = await this.git.getLogForRepo(this.status.repoPath, this.range, this.maxCount);
+            if (log !== undefined) {
+                statuses = Array.from(Iterables.flatMap(log.commits.values(), c => {
+                    return c.fileStatuses.map(s => {
+                        return { ...s, commit: c } as IGitStatusFileWithCommit;
+                    });
+                }));
+            }
+        }
+
+        if (this.status.files.length !== 0 && this.includeWorkingTree) {
+            statuses.splice(0, 0, ...this.status.files.map(s => {
+                return { ...s, commit: new GitLogCommit('file', this.status.repoPath, GitService.uncommittedSha, s.fileName, 'You', new Date(), '', s.status, [s], s.originalFileName, 'HEAD', s.fileName) } as IGitStatusFileWithCommit;
+            }));
+        }
+        statuses.sort((a, b) => b.commit.date.getTime() - a.commit.date.getTime());
+
+        const groups = Arrays.groupBy(statuses, s => s.fileName);
+
+        const children: (StatusFileCommitsNode | ShowAllNode)[] = [
+            ...Iterables.map(Objects.values<IGitStatusFileWithCommit[]>(groups),
+                statuses => new StatusFileCommitsNode(this.uri.repoPath!, statuses[statuses.length - 1], statuses.map(s => s.commit), this.context, this.git, this.branch))
+        ];
+
+        children.sort((a: StatusFileCommitsNode, b: StatusFileCommitsNode) => (a.commit.isUncommitted ? -1 : 1) - (b.commit.isUncommitted ? -1 : 1) || a.label!.localeCompare(b.label!));
+
+        if (log !== undefined && log.truncated) {
+            children.push(new ShowAllNode('Show All Changes', this, this.context));
+        }
+        return children;
+    }
+
+    async getTreeItem(): Promise<TreeItem> {
+        let files = (this.status.files !== undefined && this.includeWorkingTree) ? this.status.files.length : 0;
+
+        if (this.status.upstream !== undefined) {
+            const stats = await this.git.getChangedFilesCount(this.status.repoPath, `${this.status.upstream}...`);
+            if (stats !== undefined) {
+                files += stats.files;
+            }
+        }
+
+        const label = `${files} file${files > 1 ? 's' : ''} changed`; // ${this.status.upstream === undefined ? '' : ` (ahead of ${this.status.upstream})`}`;
+        const item = new TreeItem(label, TreeItemCollapsibleState.Collapsed);
+        item.contextValue = this.resourceType;
+        item.iconPath = {
+            dark: this.context.asAbsolutePath(`images/dark/icon-diff.svg`),
+            light: this.context.asAbsolutePath(`images/light/icon-diff.svg`)
+        };
+
+        return item;
+    }
+
+    private get includeWorkingTree(): boolean {
+        return this.git.config.gitExplorer.includeWorkingTree;
+    }
+
+}
--- a/src/views/statusNode.ts
+++ b/src/views/statusNode.ts
@@ -1,46 +1,76 @@
-import { ExtensionContext, TreeItem, TreeItemCollapsibleState } from 'vscode';
+import { commands, Disposable, ExtensionContext, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode';
 import { ExplorerNode, ResourceType } from './explorerNode';
-import { GitService, GitUri } from '../gitService';
+import { GitService, GitStatus, GitUri } from '../gitService';
+import { StatusFilesNode } from './statusFilesNode';
 import { StatusUpstreamNode } from './statusUpstreamNode';

+let _eventDisposable: Disposable | undefined;
+
 export class StatusNode extends ExplorerNode {

    readonly resourceType: ResourceType = 'gitlens:status';

-    constructor(uri: GitUri, protected readonly context: ExtensionContext, protected readonly git: GitService) {
+    constructor(
+        uri: GitUri,
+        protected readonly context: ExtensionContext,
+        protected readonly git: GitService
+    ) {
        super(uri);
-     }
+    }

    async getChildren(): Promise<ExplorerNode[]> {
        const status = await this.git.getStatusForRepo(this.uri.repoPath!);
        if (status === undefined) return [];

-        const children = [];
+        const children: ExplorerNode[] = [];

        if (status.state.behind) {
-            children.push(new StatusUpstreamNode(status, 'behind', this.git.config.gitExplorer.commitFormat, this.context, this.git));
+            children.push(new StatusUpstreamNode(status, 'behind', this.context, this.git));
        }

        if (status.state.ahead) {
-            children.push(new StatusUpstreamNode(status, 'ahead', this.git.config.gitExplorer.commitFormat, this.context, this.git));
+            children.push(new StatusUpstreamNode(status, 'ahead', this.context, this.git));
+        }
+
+        if (status.state.ahead || (status.files.length !== 0 && this.includeWorkingTree)) {
+            const range = status.upstream
+                ? `${status.upstream}..${status.branch}`
+                : undefined;
+            children.push(new StatusFilesNode(status, range, this.context, this.git));
        }

        return children;
    }

-    async getTreeItem(): Promise<TreeItem> {
+    private _status: GitStatus | undefined;
+
+    async getTreeItem(): Promise < TreeItem > {
        const status = await this.git.getStatusForRepo(this.uri.repoPath!);
        if (status === undefined) return new TreeItem('No repo status');

+        if (_eventDisposable !== undefined) {
+            _eventDisposable.dispose();
+            _eventDisposable = undefined;
+        }
+
+        if (this.includeWorkingTree) {
+            this._status = status;
+
+            _eventDisposable = this.git.onDidChangeFileSystem(this.onFileSystemChanged, this);
+            this.git.startWatchingFileSystem();
+        }
+
        let hasChildren = false;
+        const hasWorkingChanges = status.files.length !== 0 && this.includeWorkingTree;
        let label = '';
        let iconSuffix = '';
        if (status.upstream) {
            if (!status.state.ahead && !status.state.behind) {
-                label = `${status.branch} is up-to-date with ${status.upstream}`;
+                label = `${status.branch}${hasWorkingChanges ? ' has uncommitted changes and' : ''} is up-to-date with ${status.upstream}`;
            }
            else {
-                label = `${status.branch} is not up-to-date with ${status.upstream}`;
+                label = `${status.branch}${hasWorkingChanges ? ' has uncommitted changes and' : ''} is not up-to-date with ${status.upstream}`;
+
                hasChildren = true;
                if (status.state.ahead && status.state.behind) {
                    iconSuffix = '-yellow';
@@ -54,10 +84,10 @@ export class StatusNode extends ExplorerNode {
            }
        }
        else {
-            label = `${status.branch} is up-to-date`;
+            label = `${status.branch} ${hasWorkingChanges ? 'has uncommitted changes' : this.includeWorkingTree ? 'has no changes' : 'has nothing to commit'}`;
        }

-        const item = new TreeItem(label, hasChildren ? TreeItemCollapsibleState.Expanded : TreeItemCollapsibleState.None);
+        const item = new TreeItem(label, (hasChildren || hasWorkingChanges) ? TreeItemCollapsibleState.Expanded : TreeItemCollapsibleState.None);
        item.contextValue = this.resourceType;

        item.iconPath = {
@@ -67,4 +97,21 @@ export class StatusNode extends ExplorerNode {

        return item;
    }
+
+    private get includeWorkingTree(): boolean {
+        return this.git.config.gitExplorer.includeWorkingTree;
+    }
+
+    private async onFileSystemChanged(uri: Uri) {
+        const status = await this.git.getStatusForRepo(this.uri.repoPath!);
+
+        // If we haven't changed from having some working changes to none or vice versa then just refresh the node
+        // This is because of https://github.com/Microsoft/vscode/issues/34789
+        if (this._status !== undefined && status !== undefined &&
+            ((this._status.files.length === status.files.length) || (this._status.files.length > 0 && status.files.length > 0))) {
+            commands.executeCommand('gitlens.gitExplorer.refreshNode', this);
+        }
+
+        commands.executeCommand('gitlens.gitExplorer.refresh');
+    }
 }
--- a/src/views/statusUpstreamNode.ts
+++ b/src/views/statusUpstreamNode.ts
@@ -1,15 +1,20 @@
 'use strict';
 import { Iterables } from '../system';
 import { ExtensionContext, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode';
+import { CommitNode } from './commitNode';
 import { ExplorerNode, ResourceType } from './explorerNode';
 import { GitService, GitStatus, GitUri } from '../gitService';
-import { CommitNode } from './commitNode';

 export class StatusUpstreamNode extends ExplorerNode {

    readonly resourceType: ResourceType = 'gitlens:status-upstream';

-    constructor(public readonly status: GitStatus, public readonly direction: 'ahead' | 'behind', private readonly template: string, protected readonly context: ExtensionContext, protected readonly git: GitService) {
+    constructor(
+        public readonly status: GitStatus,
+        public readonly direction: 'ahead' | 'behind',
+        protected readonly context: ExtensionContext,
+        protected readonly git: GitService
+    ) {
        super(new GitUri(Uri.file(status.repoPath), { repoPath: status.repoPath, fileName: status.repoPath }));
    }

@@ -17,10 +22,11 @@ export class StatusUpstreamNode extends ExplorerNode {
        const range = this.direction === 'ahead'
            ? `${this.status.upstream}..${this.status.branch}`
            : `${this.status.branch}..${this.status.upstream}`;
+
        let log = await this.git.getLogForRepo(this.uri.repoPath!, range, 0);
        if (log === undefined) return [];

-        if (this.direction !== 'ahead') return [...Iterables.map(log.commits.values(), c => new CommitNode(c, this.template, this.context, this.git))];
+        if (this.direction !== 'ahead') return [...Iterables.map(log.commits.values(), c => new CommitNode(c, this.context, this.git))];

        // Since the last commit when we are looking 'ahead' can have no previous (because of the range given) -- look it up
        const commits = Array.from(log.commits.values());
@@ -32,13 +38,13 @@ export class StatusUpstreamNode extends ExplorerNode {
            }
        }

-        return [...Iterables.map(commits, c => new CommitNode(c, this.template, this.context, this.git))];
-}
+        return [...Iterables.map(commits, c => new CommitNode(c, this.context, this.git))];
+    }

    async getTreeItem(): Promise<TreeItem> {
        const label = this.direction === 'ahead'
-            ? `${this.status.state.ahead} commit${this.status.state.ahead > 1 ? 's' : ''} ahead (local changes)` // of ${this.status.upstream}`
-            : `${this.status.state.behind} commit${this.status.state.behind > 1 ? 's' : ''} behind (remote changes)`; // ${this.status.upstream}`;
+            ? `${this.status.state.ahead} commit${this.status.state.ahead > 1 ? 's' : ''} (ahead of ${this.status.upstream})`
+            : `${this.status.state.behind} commit${this.status.state.behind > 1 ? 's' : ''} (behind ${this.status.upstream})`;

        const item = new TreeItem(label, TreeItemCollapsibleState.Collapsed);
        item.contextValue = this.resourceType;
Author	SHA1	Message	Date
Eric Amodio	c5f57172e4	Fixes issue where work tree files could no show up	2017-09-23 23:36:43 -04:00
Eric Amodio	dd0a636e24	Preps v5.2.0	2017-09-23 23:29:49 -04:00
Eric Amodio	393ec351f0	Adds gitlens.gitExplorer.includeWorkingTree setting Adds auto-update for working trree Fixes issues with working tree status	2017-09-23 16:29:56 -04:00
Eric Amodio	99d6da9c90	Fixes issue with whitespace collapsing in decorations	2017-09-22 01:01:43 -04:00
Eric Amodio	0eb202b8ae	Closes #150 - adds auto view to custom view	2017-09-22 00:48:57 -04:00
Eric Amodio	65736a6ce7	Adds watching of creates/deletes inside .git	2017-09-21 18:43:46 -04:00
Eric Amodio	ed42eba8b8	Fixes issue with untracked files being counted properly	2017-09-21 18:43:12 -04:00
Eric Amodio	2245d82319	Preps v5.2.0-beta	2017-09-20 01:41:32 -04:00
Eric Amodio	f7df845dfe	Adds working tree status to custom view (insiders) Hides working changed files behind insiders flag Unhides Changed Files node from behind insiders flag Adds changed file count to Changed Files node label Adds icon to Changed Files node Adds upstream branch to upstream status nodes Sorts files in the Changed Files node	2017-09-20 01:37:18 -04:00
Eric Amodio	712544fab8	Adds git diff --shortstat support	2017-09-20 01:10:47 -04:00
Eric Amodio	a114e2de87	Changes the file sort in the custom view	2017-09-20 01:09:19 -04:00
Eric Amodio	70071448d6	Closes #146 - Attempts to deal with emoji in gutter Adds ability to automagically set the width of the gutter annotations	2017-09-20 01:01:21 -04:00
Eric Amodio	a10376385a	Preps v5.1.1-beta	2017-09-17 22:41:47 -04:00
Eric Amodio	41d25803d8	Updates slack links	2017-09-17 14:38:59 -04:00
Eric Amodio	3802b43027	Adds merged PR to changelog Adds new contributor to readme	2017-09-17 11:28:42 -04:00
Amanda Cameron	04ea3b7971	Apply Review Comments.	2017-09-17 11:20:21 -04:00
Amanda Cameron	6d7f44e091	Fix GitLab integration's multi-line selection.	2017-09-17 11:20:21 -04:00
Eric Amodio	3a1caa2e0d	Disables a set of context menu items by default	2017-09-17 02:44:10 -04:00
Eric Amodio	3f7058bd48	Fixes wrong setting used to control menu commands	2017-09-17 02:43:46 -04:00
Eric Amodio	71d17bcc2f	Closes #139 - adds changed files node to repository status Reworks commit-file nodes	2017-09-17 02:34:09 -04:00
Eric Amodio	a69afdb6ef	Closes #144 - support disabling the custom view	2017-09-17 01:43:41 -04:00
Eric Amodio	26c6346b84	Changes default commit format in custom view	2017-09-16 12:06:18 -04:00
Eric Amodio	3a17605017	Preps v5.1.0	2017-09-15 21:03:52 -04:00
Eric Amodio	2c9a26e47b	Fixes untracked files not showing in stash list	2017-09-15 18:12:22 -04:00
Eric Amodio	1c7785fd52	Adds note for closed issue in changelog	2017-09-15 17:39:39 -04:00
Eric Amodio	079f7b7f36	Switches to use a unicode arrow for the external link icon	2017-09-15 17:39:39 -04:00
Eric Amodio	bedc1a05f5	Preps v5.1.0-beta	2017-09-15 17:39:39 -04:00
Eric Amodio	858d9ec578	Fixes issue with stashes w/ only untracked files	2017-09-15 17:39:38 -04:00
Eric Amodio	2809991096	Closes #116 - adds full commit msg to annotations Switches to use HoverProvider for hovers in file blames	2017-09-15 17:38:37 -04:00
Eric Amodio	f6019454b6	Adds open in remote to hover annotations Optimizes annotation computation (cache by commit)	2017-09-14 23:43:41 -04:00
Eric Amodio	f0bdf3e2c3	Always caches remotes	2017-09-14 22:46:40 -04:00
Eric Amodio	0fdf856c27	Adds performance logging	2017-09-14 22:45:23 -04:00
Eric Amodio	aacf7cc2b5	Reworks date parsing, formatting etc for perf Isolates moment.js	2017-09-14 21:52:51 -04:00