Preps v5.0.0-alpha

Updates dependencies
2026-02-12 02:58:32 -05:00 · 2017-09-02 01:46:29 -04:00
76 changed files with 1638 additions and 2339 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,98 +4,63 @@ 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/).

-## [5.0.0-beta] - 2017-09-11
+## [5.0.0-alpha] - 2017-09-02
 ### Added
 - Adds an all-new `GitLens` custom view to the Explorer activity

  - `Repository View` - provides a full repository explorer

-    ![GitLens Repository view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-git-custom-view-repository.png)
+    ![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 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 a context menu with `Open Repository in Remote`, and `Refresh` commands
+    - `Status` node — provides the status of current branch
+      - Indicates whether or not the current branch is up-to-date with its upstream branch
+      - If the branch is out of sync, additional nodes will be shown with the specific commits ahead and/or behind the upstream

    - `Branches` node — provides a list of the local branches
-      - Indicates which branch is the current branch and optionally shows the remote tracking branch
+      - Indicates which branch is the current branch
      - Expand each branch to easily see its revision (commit) history
        - Expand each revision (commit) to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes
-           - Provides a context menu on each changed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, `Apply Changes`, and `Show Commit File Details` commands
-        - Provides a context menu on each revision (commit) with `Open Commit in Remote`, `Copy Commit ID to Clipboard`, `Copy Commit Message to Clipboard`, `Open Files`, `Open Revisions`, `Show Commit Details`, and `Refresh` commands
-        - Provides a context menu on each branch with `Open Branch in Remote`, and `Refresh` commands
-      - Provides a context menu with `Open Branches in Remote`, and `Refresh` commands
+           - Provides a context menu on each changed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, and `Show Commit File Details` commands
+        - Provides a context menu on each revision (commit) with `Open Commit in Remote`, `Copy Commit ID to Clipboard`, `Copy Commit Message to Clipboard`, `Open Files`, `Open Revisions`, and `Show Commit Details` commands
+      - Provides a context menu on each branch with an `Open Branch in Remote` command

-    - `Remotes` node — provides a list of remotes
-      - Expand each remote to see its list of branches
-        - Expand each branch to easily see its revision (commit) history
-          - Expand each revision (commit) to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes
-            - Provides a context menu on each changed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, `Apply Changes`, and `Show Commit File Details` commands
-          - Provides a context menu on each revision (commit) with `Open Commit in Remote`, `Copy Commit ID to Clipboard`, `Copy Commit Message to Clipboard`, `Open Files`, `Open Revisions`, `Show Commit Details`, and `Refresh` commands
-        - Provides a context menu on each remote with `Open Branches in Remote`, `Open Repository in Remote`, and `Refresh` commands
-      - Provides a context menu with a `Refresh` command
+    - `Remotes` node — provides a list of the remote branches
+      - See `Branches` node above for details

    - `Stashes` node — provides a list of stashed changes
      - Expand each stash to quickly see the set of files stashed, complete with status indicators for adds, changes, renames, and deletes
-      - Provides a context menu with `Stash Changes`, and `Refresh` commands
-      - Provides a context menu on each stash with `Apply Stashed Changes` (confirmation required), `Delete Stashed Changes` (confirmation required), `Copy Commit Message to Clipboard`, `Open Files`, `Open Revisions`, and `Refresh` commands
-      - Provides a context menu on each stashed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Apply Changes`, and `Show File History` commands
+      - Provides a context menu on each stash with `Apply Stashed Changes` (confirmation required), `Delete Stashed Changes` (confirmation required), `Copy Commit Message to Clipboard`, `Open Files`, and `Open Revisions` commands
+      - Provides a context menu on each stashed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, and `Show File History` commands

  - `History View` - provides the revision history of the active file

-    ![GitLens History view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-git-custom-view-history.png)
+    ![GitLens History view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-custom-view-history.png)

    - Automatically updates to track the active editor
-    - Provides a context menu with `Open File`, `Open File in Remote`, and `Refresh` commands
-    - Provides a context menu on each revision (commit) with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, `Apply Changes`, and `Show Commit File Details` commands
+    - Provides a context menu on each revision (commit) with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, and `Show Commit File Details` commands

  - Quickly switch between views using the `Switch to Repository View` or `Switch to History View` commands
-  - Provides toolbar commands to `Search Commits`, `Switch to Repository View` or `Switch to History View`, and `Refresh`
+  - Provides toolbar buttons to `Search Commits`, `Switch to Repository View` or `Switch to History View`, and `Refresh`

- Adds command-links to the `details` hover annotation
-  - Clicking the commit id will run the `Show Commit Details` command (`gitlens.showQuickCommitDetails`)
- Adds command-links to the `changes` hover annotation
-  - 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`)
- Adds support for custom remote services - see [#120](https://github.com/eamodio/vscode-gitlens/issues/120)
- Adds `Compare File Revisions` command (`gitlens.diffWith`) - compares the specified file revisions
- Adds `Open Branches in Remote` command (`gitlens.openBranchesInRemote`) - opens the branches in the supported remote service
- Adds `Stash Changes` command (`gitlens.stashSave`) to the source control group context menu -- can now stash a group of files
- Adds `Stash Changes` command (`gitlens.stashSave`) to the source control resource context menu -- can now stash individual files (works with multi-select too!)
- Adds `gitlens.gitExplorer.view` setting to specify the starting view (mode) of the `GitLens` custom view
- Adds `gitlens.gitExplorer.showTrackingBranch` setting to specify whether or not to show the tracking branch when displaying local branches in the `GitLens` custom view
- Adds `gitlens.gitExplorer.commitFormat` setting to specify the format of committed changes in the `GitLens` custom view
- Adds `gitlens.gitExplorer.commitFileFormat` setting to specify the format of a committed file in the `GitLens` custom view
- Adds `gitlens.gitExplorer.stashFormat` setting to specify the format of stashed changes in the `GitLens` custom view
- Adds `gitlens.gitExplorer.stashFileFormat` setting to specify the format of a stashed file in the `GitLens` custom view
- Adds `${filePath}` token to file formatting settings
+- Adds `${filePath}` token to file formatting

 ### Changed
- Changes `Show Stashed Changes` option icon in repository status quick pick menu to match the `GitLens` custom view
- Changes `Stash Changes` option icon in stashed changes quick pick menu to a plus (+)
- Renames `Compare File with Previous` command (`gitlens.diffWithPrevious`) to `Compare File with Previous Revision`
+- Renames `Compare File with Previous` command (gitlens.diffWithPrevious) to `Compare File with Previous Revision`
 - Renames `Compare File with Next Commit` command (`gitlens.diffWithNext`) to `Compare File with Next Revision`
 - Renames `Compare File with Working Tree` command (`gitlens.diffWithWorking`) to `Compare File with Working Revision`
 - Renames `Compare Line Commit with Previous` command (`gitlens.diffLineWithPrevious`) to `Compare Line Revision with Previous`
 - Renames `Compare Line Commit with Working Tree` command (`gitlens.diffLineWithWorking`) to `Compare Line Revision with Working`

-### Removed
- Removes `Git Stashes` custom view view - as it's functionality has been folded into the new `GitLens` custom view
- Removes `gitlens.stashExplorer.stashFormat` setting
- Removes `gitlens.stashExplorer.stashFileFormat` setting
- Removes `Stash Unstaged Changes` option from stashed changes quick pick menu -- didn't work as intended
+- Renames `gitlens.stashExplorer.stashFormat` setting to `gitlens.gitExplorer.stashFormat`
+- Renames `gitlens.stashExplorer.stashFileFormat` setting to `gitlens.gitExplorer.stashFileFormat`
+- Changes `gitlens.gitExplorer.stashFileFormat` setting to defaults to `${filePath}` for better separator handling
+
+## Removed
+- Removes the `Git Stashes` custom view view - as it's functionality has been folded into the new `GitLens` custom view
 - Removes the seeding of the commit search command from the clipboard

-### Fixed
+## Fixed
 - Fixes an issue where remote branches couldn't be opened properly in their remote service
- Fixes [#130](https://github.com/eamodio/vscode-gitlens/issues/130) - First-run "Thank you for choosing GitLens! [...]" info message shown on every start up
- Fixes [#120](https://github.com/eamodio/vscode-gitlens/issues/120) - Feature Request: "Open in Remote" support for custom repositories
- Fixes an issue where sometimes diffs (via branch name) wouldn't open properly

 ## [4.4.3] - 2017-08-30
 ## Fixed
@@ -157,7 +122,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ## Added
 - Adds `Git Stashes` custom view to the Explorer activity

-  ![Git Stashes view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-git-stashes.png)
+  ![Git Stashes view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-stashes.png)

  - Shows all of the stashed changes in the repository
  - Provides toolbar buttons to `Stash Changes` and `Refresh`
@@ -167,7 +132,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

 ## [4.2.0] - 2017-06-27
 ## Added
- Adds `Compare File with Revision...` command (`gitlens.diffWithRevision`) - compares the active file with the selected revision of the same file
+- Adds `Compare File with Revision...` command (`gitlens.diffWithRevision`) - compare the active file with the selected revision of the same file
 - Adds `Open Changed Files` command (`gitlens.openChangedFiles`) to the source control group context menu
 - Adds `Close Unchanged Files` command (`gitlens.closeUnchangedFiles`) to the source control group context menu
 - Adds `Open File in Remote` command (`gitlens.openFileInRemote`) to the source control resource context menu
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ GitLens **supercharges** the built-in Visual Studio Code Git capabilities. It he
 GitLens provides an unobtrusive blame annotation at the end of the current line, a status bar item showing the commit information (author and date, by default) of the current line, code lens showing the most recent commit and # of authors of the file and/or code block, and many commands for exploring commits and histories, comparing and navigating revisions, stash access, repository status, and more. GitLens is also [highly customizable](#extension-settings) to meet your specific needs — find code lens intrusive or the current line blame annotation distracting — no problem, it is easy to [turn them off or change how they behave](#extension-settings).

 ### Preview — featuring blame annotations, code lens, status bar details, quick pick menus for navigation and exploration, compare with previous, and more
-![GitLens preview](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/gitlens-preview.gif)
+![GitLens preview](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/gitlens-preview.gif)

 ## Features

@@ -18,30 +18,26 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,

 - Adds an unobtrusive, highly [customizable](#line-blame-annotation-settings) and [themeable](#theme-settings), **Git blame annotation** to the end of the current line ([optional](#line-blame-annotation-settings), on by default)

-  ![Line Blame Annotation](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-line-blame-annotation.png)
+  ![Line Blame Annotation](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-line-blame-annotation.png)
  - Contains the author, date, and message of the line's most recent commit, by [default](#line-blame-annotation-settings)
  - Adds a `details` hover annotation to the current line annotation, which provides more commit details ([optional](#line-blame-annotation-settings), on by default)
-    - Clicking the commit id will run the `Show Commit Details` command (`gitlens.showQuickCommitDetails`)
  - 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`)

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

 - Adds on-demand, beautiful, highly [customizable](#file-blame-annotation-settings) and [themeable](#theme-settings), **Git blame annotations** of the whole file

-  ![File Blame Annotation](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-file-blame-annotations.png)
+  ![File Blame Annotation](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-file-blame-annotations.png)
  - Choose between `gutter` (default) and `hover` [annotation styles](#file-blame-annotation-settings)
  - Contains the commit message and date, by [default](#file-blame-annotation-settings)
  - Adds a `details` hover annotation to the line's annotation, which provides more commit details ([optional](#file-blame-annotation-settings), on by default)
-    - Clicking the commit id will run the `Show Commit Details` command (`gitlens.showQuickCommitDetails`)
  - Adds a `heatmap` (age) indicator to the gutter annotations (on right edge by [default](#file-blame-annotation-settings)), which provides an easy, at-a-glance way to tell the age of a line ([optional](#file-blame-annotation-settings), on by default)
    - Indicator ranges from bright yellow (newer) to dark brown (older)
  - Press `Escape` to quickly toggle the annotations off

 - Adds [customizable](#status-bar-settings) **blame information** about the current line to the **status bar**  ([optional](#status-bar-settings), on by default)

-  ![Status Bar Blame](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-status-bar.png)
+  ![Status Bar Blame](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-status-bar.png)
  - Contains the commit author and date, by [default](#status-bar-settings)
  - Clicking the status bar item will, by [default](#status-bar-settings), show a **commit details quick pick menu** with commands for comparing, navigating and exploring commits, and more
  - Provides [customizable](#status-bar-settings) click behavior — choose between one of the following
@@ -65,10 +61,7 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,
 - Adds on-demand, [customizable](#file-recent-changes-annotation-settings) and [themeable](#theme-settings), **recent changes annotations** of the whole file
  - Highlights all of lines changed in the most recent commit
  - Adds a `details` hover annotation to each line, which provides more commit details ([optional](#file-blame-annotation-settings), on by default)
-    - Clicking the commit id will run the `Show Commit Details` command (`gitlens.showQuickCommitDetails`)
  - Adds a `changes` (diff) hover annotation to each line, which provides **instant** access to the line's previous version ([optional](#file-recent-changes-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`)
  - Press `Escape` to quickly toggle the annotations off

 - Adds `Toggle Recent File Changes Annotations` command (`gitlens.toggleFileRecentChanges`) to toggle the recent changes annotations on and off
@@ -77,7 +70,7 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,

 - Adds **code lens** to the top of the file and on code blocks ([optional](#code-lens-settings), on by default)

-  ![Git Code Lens](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-code-lens.png)
+  ![Git Code Lens](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-code-lens.png)
  - **Recent Change** — author and date of the most recent commit for the file or code block
    - Clicking the code lens will, by [default](#code-lens-settings), show a **commit file details quick pick menu** with commands for comparing, navigating and exploring commits, and more
  - **Authors** — number of authors of the file or code block and the most prominent author (if there is more than one)
@@ -122,57 +115,41 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,

  - `Repository View` - provides a full repository explorer

-    ![GitLens Repository view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-git-custom-view-repository.png)
+    ![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 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 a context menu with `Open Repository in Remote`, and `Refresh` commands
+    - `Status` node — provides the status of current branch
+      - Indicates whether or not the current branch is up-to-date with its upstream branch
+      - If the branch is out of sync, additional nodes will be shown with the specific commits ahead and/or behind the upstream

    - `Branches` node — provides a list of the local branches
-      - Indicates which branch is the current branch and [optionally](#gitlens-custom-view-settings) shows the remote tracking branch
+      - Indicates which branch is the current branch
      - Expand each branch to easily see its revision (commit) history
        - Expand each revision (commit) to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes
-           - Provides a context menu on each changed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, `Apply Changes`, and `Show Commit File Details` commands
-        - Provides a context menu on each revision (commit) with `Open Commit in Remote`, `Copy Commit ID to Clipboard`, `Copy Commit Message to Clipboard`, `Open Files`, `Open Revisions`, `Show Commit Details`, and `Refresh` commands
-        - Provides a context menu on each branch with `Open Branch in Remote`, and `Refresh` commands
-      - Provides a context menu with `Open Branches in Remote`, and `Refresh` commands
+           - Provides a context menu on each changed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, and `Show Commit File Details` commands
+        - Provides a context menu on each revision (commit) with `Open Commit in Remote`, `Copy Commit ID to Clipboard`, `Copy Commit Message to Clipboard`, `Open Files`, `Open Revisions`, and `Show Commit Details` commands
+      - Provides a context menu on each branch with an `Open Branch in Remote` command

-    - `Remotes` node — provides a list of remotes
-      - Expand each remote to see its list of branches
-        - Expand each branch to easily see its revision (commit) history
-          - Expand each revision (commit) to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes
-            - Provides a context menu on each changed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, `Apply Changes`, and `Show Commit File Details` commands
-          - Provides a context menu on each revision (commit) with `Open Commit in Remote`, `Copy Commit ID to Clipboard`, `Copy Commit Message to Clipboard`, `Open Files`, `Open Revisions`, `Show Commit Details`, and `Refresh` commands
-        - Provides a context menu on each remote with `Open Branches in Remote`, `Open Repository in Remote`, and `Refresh` commands
-      - Provides a context menu with a `Refresh` command
+    - `Remotes` node — provides a list of the remote branches
+      - See `Branches` node above for details

    - `Stashes` node — provides a list of stashed changes
      - Expand each stash to quickly see the set of files stashed, complete with status indicators for adds, changes, renames, and deletes
-      - Provides a context menu with `Stash Changes`, and `Refresh` commands
-      - Provides a context menu on each stash with `Apply Stashed Changes` (confirmation required), `Delete Stashed Changes` (confirmation required), `Copy Commit Message to Clipboard`, `Open Files`, `Open Revisions`, and `Refresh` commands
-      - Provides a context menu on each stashed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Apply Changes`, and `Show File History` commands
+      - Provides a context menu on each stash with `Apply Stashed Changes` (confirmation required), `Delete Stashed Changes` (confirmation required), `Copy Commit Message to Clipboard`, `Open Files`, and `Open Revisions` commands
+      - Provides a context menu on each stashed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, and `Show File History` commands

  - `History View` - provides the revision history of the active file

-    ![GitLens History view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-git-custom-view-history.png)
+    ![GitLens History view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-custom-view-history.png)

    - Automatically updates to track the active editor
-    - Provides a context menu with `Open File`, `Open File in Remote`, and `Refresh` commands
-    - Provides a context menu on each revision (commit) with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, `Apply Changes`, and `Show Commit File Details` commands
+    - Provides a context menu on each revision (commit) with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, and `Show Commit File Details` commands

  - Quickly switch between views using the `Switch to Repository View` or `Switch to History View` commands
-  - Provides toolbar commands to `Search Commits`, `Switch to Repository View` or `Switch to History View`, and `Refresh`
+  - Provides toolbar buttons to `Search Commits`, `Switch to Repository View` or `Switch to History View`, and `Refresh`

 - Adds a `Search Commits` command (`gitlens.showCommitSearch`) with a shortcut of `alt+/` to search for commits by message, author, file(s), or commit id

 - Adds commands to open files, commits, branches, and the repository in the supported remote services, currently **BitBucket, GitHub, GitLab, and Visual Studio Team Services** — only available if a Git upstream service is configured in the repository
-  - `Open Branches in Remote` command (`gitlens.openBranchesInRemote`) — opens the branches in the supported remote service
  - `Open Branch in Remote` command (`gitlens.openBranchInRemote`) — opens the current branch commits in the supported remote service
  - `Open Commit in Remote` command (`gitlens.openCommitInRemote`) — opens the commit revision of the active line in the supported remote service
  - `Open File in Remote` command (`gitlens.openFileInRemote`) — opens the active file/revision in the supported remote service
@@ -180,7 +157,7 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,

 - Adds a `Show Current Branch History` command (`gitlens.showQuickRepoHistory`) with a shortcut of `shift+alt+h` to show a paged **branch history quick pick menu** of the current branch for exploring its commit history

-  ![Branch History Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-branch-history.png)
+  ![Branch History Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-branch-history.png)

  - Provides entries to `Show Commit Search` and `Open Branch in <remote-service>` when available
  - Navigate back to the previous quick pick menu via `alt+left arrow`, if available
@@ -191,7 +168,7 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,

 - Adds a `Show File History` command (`gitlens.showQuickFileHistory`) to show a paged **file history quick pick menu** of the active file for exploring its commit history

-  ![File History Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-file-history.png)
+  ![File History Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-file-history.png)

  - Provides entries to `Show Branch History` and `Open File in <remote-service>` when available
  - Navigate back to the previous quick pick menu via `alt+left arrow`, if available
@@ -199,7 +176,7 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,

 - Adds a `Show Commit Details` command (`gitlens.showQuickCommitDetails`) to show a **commit details quick pick menu** of the most recent commit of the active file

-  ![Commit Details Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-commit-details.png)
+  ![Commit Details Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-commit-details.png)

  - Quickly see the set of files changed in the commit, complete with status indicators for adds, changes, renames, and deletes
  - Provides entries to `Copy to Clipboard`, `Directory Compare`, `Open Changed Files`, `Open File in <remote-service>` when available, and more
@@ -209,7 +186,7 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,

 - Adds a `Show Commit File Details` command (`gitlens.showQuickCommitFileDetails`) with a shortcut of `alt+c` to show a **file commit details quick pick menu** of the most recent commit of the active file

-  ![Commit File Details Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-commit-file-details.png)
+  ![Commit File Details Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-commit-file-details.png)

  - Provides entries to `Show Commit Details`, `Show File History`, `Compare File with...`, `Copy to Clipboard`, `Open File`, `Open File in <remote-service>` when available, and more
  - Navigate back to the previous quick pick menu via `alt+left arrow`, if available
@@ -217,7 +194,7 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,

 - Adds a `Show Repository Status` command (`gitlens.showQuickRepoStatus`) with a shortcut of `alt+s` to show a **repository status quick pick menu** for visualizing the current repository status

-  ![Repository Status Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-repo-status.png)
+  ![Repository Status Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-repo-status.png)

  - Quickly see upstream status (if an Git upstream is configured) — complete with ahead and behind information
    - If you are ahead of the upstream, an entry will be shown with the number of commits ahead. Choosing it will show a limited **branch history quick pick menu** containing just the commits ahead of the upstream
@@ -229,14 +206,14 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,

 - Adds a `Show Stashed Changes` command (`gitlens.showQuickStashList`) to show a **stashed changes quick pick menu** for exploring your repository stash history

-  ![Stashed Changes Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-stash-list.png)
+  ![Stashed Changes Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-stash-list.png)

  - Provides entries to `Stash Changes`
  - Navigate back to the previous quick pick menu via `alt+left arrow`, if available

  - Choosing a stash entry shows a **stash details quick pick menu** which is very similar to the **commit details quick pick menu** above

-    ![Stash Details Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/screenshot-stash-details.png)
+    ![Stash Details Quick Pick Menu](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-stash-details.png)

    - Quickly see the set of files changed in the stash, complete with status indicators for adds, changes, renames, and deletes
    - Provides entries to `Copy Message to Clipboard`, `Directory Compare`, and `Open Changed Files`
@@ -266,7 +243,6 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,
 - Adds a `Apply Stashed Changes` command (`gitlens.stashApply`) to chose a stash entry to apply to the working tree from a quick pick menu

 - Adds a `Stash Changes` command (`gitlens.stashSave`) to save any working tree changes to the stash — can optionally provide a stash message
-  - Also adds the command to the Source Control items context menu to stash an individual or group of files, works with multi-select too!

 ## Insiders

@@ -344,18 +320,11 @@ 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.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 Custom Remotes Settings
-
-|Name | Description
-|-----|------------
-|`gitlens.remotes`|Specifies the custom remote services (code-hosting)"
-
 ### Status Bar Settings

 |Name | Description
--- a/images/dark/icon-repo-green.svg
+++ b/images/dark/icon-repo-green.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <path fill="#C5C5C5" d="m6,12l-1,0l0,-1l1,0l0,1l0,0zm0,-3l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm8,-1l0,12c0,0.55 -0.45,1 -1,1l-5,0l0,2l-1.5,-1.5l-1.5,1.5l0,-2l-2,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l10,0c0.55,0 1,0.45 1,1l0,0zm-1,10l-10,0l0,2l2,0l0,-1l3,0l0,1l5,0l0,-2l0,0zm0,-10l-9,0l0,9l9,0l0,-9l0,0z" />
-    <ellipse fill="#32cd32" stroke="#C5C5C5" stroke-width="0.5" rx="3" ry="3" cx="13" cy="4" />
-</svg>
--- a/images/dark/icon-repo-red.svg
+++ b/images/dark/icon-repo-red.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <path fill="#C5C5C5" d="m6,12l-1,0l0,-1l1,0l0,1l0,0zm0,-3l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm8,-1l0,12c0,0.55 -0.45,1 -1,1l-5,0l0,2l-1.5,-1.5l-1.5,1.5l0,-2l-2,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l10,0c0.55,0 1,0.45 1,1l0,0zm-1,10l-10,0l0,2l2,0l0,-1l3,0l0,1l5,0l0,-2l0,0zm0,-10l-9,0l0,9l9,0l0,-9l0,0z" />
-    <ellipse fill="#cd3131" stroke="#C5C5C5" stroke-width="0.5" rx="3" ry="3" cx="13" cy="4" />
-</svg>
--- a/images/dark/icon-repo-yellow.svg
+++ b/images/dark/icon-repo-yellow.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <path fill="#C5C5C5" d="m6,12l-1,0l0,-1l1,0l0,1l0,0zm0,-3l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm8,-1l0,12c0,0.55 -0.45,1 -1,1l-5,0l0,2l-1.5,-1.5l-1.5,1.5l0,-2l-2,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l10,0c0.55,0 1,0.45 1,1l0,0zm-1,10l-10,0l0,2l2,0l0,-1l3,0l0,1l5,0l0,-2l0,0zm0,-10l-9,0l0,9l9,0l0,-9l0,0z" />
-    <ellipse fill="#cdcd32" stroke="#C5C5C5" stroke-width="0.5" rx="3" ry="3" cx="13" cy="4" />
-</svg>
--- a/images/light/icon-repo-green.svg
+++ b/images/light/icon-repo-green.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <path fill="#424242" d="m6,12l-1,0l0,-1l1,0l0,1l0,0zm0,-3l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm8,-1l0,12c0,0.55 -0.45,1 -1,1l-5,0l0,2l-1.5,-1.5l-1.5,1.5l0,-2l-2,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l10,0c0.55,0 1,0.45 1,1l0,0zm-1,10l-10,0l0,2l2,0l0,-1l3,0l0,1l5,0l0,-2l0,0zm0,-10l-9,0l0,9l9,0l0,-9l0,0z" />
-    <ellipse fill="#32cd32" stroke="#424242" stroke-width="0.5" rx="3" ry="3" cx="13" cy="4" />
-</svg>
--- a/images/light/icon-repo-red.svg
+++ b/images/light/icon-repo-red.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <path fill="#424242" d="m6,12l-1,0l0,-1l1,0l0,1l0,0zm0,-3l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm8,-1l0,12c0,0.55 -0.45,1 -1,1l-5,0l0,2l-1.5,-1.5l-1.5,1.5l0,-2l-2,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l10,0c0.55,0 1,0.45 1,1l0,0zm-1,10l-10,0l0,2l2,0l0,-1l3,0l0,1l5,0l0,-2l0,0zm0,-10l-9,0l0,9l9,0l0,-9l0,0z" />
-    <ellipse fill="#cd3131" stroke="#424242" stroke-width="0.5" rx="3" ry="3" cx="13" cy="4" />
-</svg>
--- a/images/light/icon-repo-yellow.svg
+++ b/images/light/icon-repo-yellow.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <path fill="#424242" d="m6,12l-1,0l0,-1l1,0l0,1l0,0zm0,-3l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm8,-1l0,12c0,0.55 -0.45,1 -1,1l-5,0l0,2l-1.5,-1.5l-1.5,1.5l0,-2l-2,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l10,0c0.55,0 1,0.45 1,1l0,0zm-1,10l-10,0l0,2l2,0l0,-1l3,0l0,1l5,0l0,-2l0,0zm0,-10l-9,0l0,9l9,0l0,-9l0,0z" />
-    <ellipse fill="#cdcd32" stroke="#424242" stroke-width="0.5" rx="3" ry="3" cx="13" cy="4" />
-</svg>
--- a/images/screenshot-branch-history.png
+++ b/images/screenshot-branch-history.png
--- a/images/screenshot-commit-details.png
+++ b/images/screenshot-commit-details.png
--- a/images/screenshot-commit-file-details.png
+++ b/images/screenshot-commit-file-details.png
--- a/images/screenshot-file-history.png
+++ b/images/screenshot-file-history.png
--- a/images/screenshot-git-custom-view-history.png
+++ b/images/screenshot-git-custom-view-history.png
--- a/images/screenshot-git-custom-view-repository.png
+++ b/images/screenshot-git-custom-view-repository.png
--- a/images/screenshot-repo-status.png
+++ b/images/screenshot-repo-status.png
--- a/images/screenshot-stash-details.png
+++ b/images/screenshot-stash-details.png
--- a/images/screenshot-stash-list.png
+++ b/images/screenshot-stash-list.png
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "gitlens",
-    "version": "5.0.0-beta",
+    "version": "5.0.0-alpha",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
@@ -16,19 +16,19 @@
            "integrity": "sha1-qjuL2ivlErGuCgV7lC6GnDcKVWk=",
            "dev": true,
            "requires": {
-                "@types/node": "8.0.28"
+                "@types/node": "8.0.26"
            }
        },
        "@types/mocha": {
-            "version": "2.2.43",
-            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.43.tgz",
-            "integrity": "sha512-xNlAmH+lRJdUMXClMTI9Y0pRqIojdxfm7DHsIxoB2iTzu3fnPmSMEN8SsSx0cdwV36d02PWCWaDUoZPDSln+xw==",
+            "version": "2.2.42",
+            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.42.tgz",
+            "integrity": "sha512-b6gVDoxEbAQGwbV7gSzeFw/hy3/eEAokztktdzl4bHvGgb9K5zW4mVQDlVYch2w31m8t/J7L2iqhQvz3r5edCQ==",
            "dev": true
        },
        "@types/node": {
-            "version": "8.0.28",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.28.tgz",
-            "integrity": "sha512-HupkFXEv3O3KSzcr3Ylfajg0kaerBg1DyaZzRBBQfrU3NN1mTBRE7sCveqHwXLS5Yrjvww8qFzkzYQQakG9FuQ==",
+            "version": "8.0.26",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.26.tgz",
+            "integrity": "sha512-wbKN0MB4XsjdnSE04HiCzLoBDirGCM6zXrqavSj44nZnPFYpnrTF64E9O6Xmf0ca/IuKK/BHUcXwMiwk92gW6Q==",
            "dev": true
        },
        "@types/tmp": {
@@ -348,7 +348,7 @@
            "resolved": "https://registry.npmjs.org/copy-paste/-/copy-paste-1.3.0.tgz",
            "integrity": "sha1-p+bEocKP3t8rCB5yuX3y75X0ce0=",
            "requires": {
-                "iconv-lite": "0.4.19",
+                "iconv-lite": "0.4.18",
                "sync-exec": "0.6.2"
            }
        },
@@ -1248,12 +1248,6 @@
                "sntp": "1.0.9"
            }
        },
-        "he": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-            "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-            "dev": true
-        },
        "hoek": {
            "version": "2.16.3",
            "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
@@ -1272,9 +1266,9 @@
            }
        },
        "iconv-lite": {
-            "version": "0.4.19",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-            "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+            "version": "0.4.18",
+            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz",
+            "integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA=="
        },
        "ignore": {
            "version": "3.3.5",
@@ -1794,9 +1788,9 @@
            }
        },
        "mocha": {
-            "version": "3.5.2",
-            "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.2.tgz",
-            "integrity": "sha512-iH5zl7afRZl1GvD0pnrRlazgc9Z/o34pXWmTFi8xNIMFKXgNL1SoBTDDb9sJfbV/sJV/j8X+0gvwY1QS1He7Nw==",
+            "version": "3.5.0",
+            "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.0.tgz",
+            "integrity": "sha512-pIU2PJjrPYvYRqVpjXzj76qltO9uBYI7woYAMoxbSefsa+vqAfptjoeevd6bUgwD0mPIO+hv9f7ltvsNreL2PA==",
            "dev": true,
            "requires": {
                "browser-stdout": "1.3.0",
@@ -1806,7 +1800,6 @@
                "escape-string-regexp": "1.0.5",
                "glob": "7.1.1",
                "growl": "1.9.2",
-                "he": "1.1.1",
                "json3": "3.3.2",
                "lodash.create": "3.1.1",
                "mkdirp": "0.5.1",
@@ -2241,9 +2234,9 @@
            "dev": true
        },
        "source-map-support": {
-            "version": "0.4.18",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-            "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+            "version": "0.4.16",
+            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.16.tgz",
+            "integrity": "sha512-A6vlydY7H/ljr4L2UOhDSajQdZQ6dMD7cLH0pzwcmwLyc9u8PNI4WGtnfDDzX7uzGL6c/T+ORL97Zlh+S4iOrg==",
            "dev": true,
            "requires": {
                "source-map": "0.5.7"
@@ -2334,15 +2327,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",
@@ -2352,6 +2336,15 @@
                "safe-buffer": "5.1.1"
            }
        },
+        "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"
+            }
+        },
        "stringstream": {
            "version": "0.0.5",
            "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -2714,10 +2707,10 @@
                "gulp-symdest": "1.1.0",
                "gulp-untar": "0.0.6",
                "gulp-vinyl-zip": "1.4.0",
-                "mocha": "3.5.2",
+                "mocha": "3.5.0",
                "request": "2.81.0",
                "semver": "5.4.1",
-                "source-map-support": "0.4.18",
+                "source-map-support": "0.4.16",
                "url-parse": "1.1.9",
                "vinyl-source-stream": "1.1.0"
            }
--- a/package.json
+++ b/package.json
@@ -1,13 +1,13 @@
 {
    "name": "gitlens",
-    "version": "5.0.0-beta",
+    "version": "5.0.0-alpha",
    "author": {
        "name": "Eric Amodio",
        "email": "eamodio@gmail.com"
    },
    "publisher": "eamodio",
    "engines": {
-        "vscode": "^1.16.0"
+        "vscode": "^1.15.0"
    },
    "license": "SEE LICENSE IN LICENSE",
    "displayName": "Git Lens \u2014 git blame annotations, code lens, and more",
@@ -413,6 +413,15 @@
                    "default": null,
                    "description": "Specifies how all absolute dates will be formatted by default\nSee https://momentjs.com/docs/#/displaying/format/ for valid formats"
                },
+                "gitlens.gitExplorer.view": {
+                    "type": "string",
+                    "default": "repository",
+                    "enum": [
+                        "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"
+                },
                "gitlens.gitExplorer.commitFormat": {
                    "type": "string",
                    "default": "${message} \u00a0\u2022\u00a0 ${authorAgo} \u00a0\u2022\u00a0 ${id}",
@@ -423,11 +432,6 @@
                    "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.showTrackingBranch": {
-                    "type": "boolean",
-                    "default": true,
-                    "description": "Specifies whether or not to show the tracking branch when displaying local branches in the `GitLens` custom view"
-                },
                "gitlens.gitExplorer.stashFormat": {
                    "type": "string",
                    "default": "${message}",
@@ -438,43 +442,6 @@
                    "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.view": {
-                    "type": "string",
-                    "default": "repository",
-                    "enum": [
-                        "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"
-                },
-                "gitlens.remotes": {
-                    "type": "array",
-                    "default": null,
-                    "items": {
-                        "type": "object",
-                        "required": [
-                            "type",
-                            "domain"
-                        ],
-                        "properties": {
-                            "type": {
-                                "type": "string",
-                                "enum": [
-                                    "Bitbucket",
-                                    "GitHub",
-                                    "GitLab"
-                                ],
-                                "description": "Specifies the type of the custom remote service\n `Bitbucket`, `GitHub`, or `GitLab`"
-                            },
-                            "domain": {
-                                "type": "string",
-                                "description": "Specifies the domain name of the custom remote service"
-                            }
-                        }
-                    },
-                    "uniqueItems": true,
-                    "description": "Specifies the custom remote services (code-hosting)"
-                },
                "gitlens.statusBar.enabled": {
                    "type": "boolean",
                    "default": true,
@@ -812,11 +779,6 @@
                "title": "Directory Compare",
                "category": "GitLens"
            },
-            {
-                "command": "gitlens.diffWith",
-                "title": "Compare File Revisions",
-                "category": "GitLens"
-            },
            {
                "command": "gitlens.diffWithBranch",
                "title": "Compare File with Branch...",
@@ -987,11 +949,6 @@
                "title": "Open Changed Files",
                "category": "GitLens"
            },
-            {
-                "command": "gitlens.openBranchesInRemote",
-                "title": "Open Branches in Remote",
-                "category": "GitLens"
-            },
            {
                "command": "gitlens.openBranchInRemote",
                "title": "Open Branch in Remote",
@@ -1097,11 +1054,6 @@
                "command": "gitlens.gitExplorer.openChangedFileRevisions",
                "title": "Open Revisions",
                "category": "GitLens"
-            },
-            {
-                "command": "gitlens.gitExplorer.applyChanges",
-                "title": "Apply Changes",
-                "category": "GitLens"
            }
        ],
        "menus": {
@@ -1110,10 +1062,6 @@
                    "command": "gitlens.diffDirectory",
                    "when": "gitlens:enabled"
                },
-                {
-                    "command": "gitlens.diffWith",
-                    "when": "false"
-                },
                {
                    "command": "gitlens.diffWithBranch",
                    "when": "gitlens:isTracked"
@@ -1230,10 +1178,6 @@
                    "command": "gitlens.openChangedFiles",
                    "when": "gitlens:enabled"
                },
-                {
-                    "command": "gitlens.openBranchesInRemote",
-                    "when": "gitlens:hasRemotes"
-                },
                {
                    "command": "gitlens.openBranchInRemote",
                    "when": "gitlens:hasRemotes"
@@ -1301,10 +1245,6 @@
                {
                    "command": "gitlens.gitExplorer.openChangedFileRevisions",
                    "when": "false"
-                },
-                {
-                    "command": "gitlens.gitExplorer.applyChanges",
-                    "when": "false"
                }
            ],
            "editor/context": [
@@ -1378,12 +1318,12 @@
                },
                {
                    "command": "gitlens.openFileInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && config.gitlens.advanced.menus.editorTitleContext.remote",
+                    "when": "gitlens:enabled && config.gitlens.advanced.menus.editorTitleContext.remote",
                    "group": "1_gitlens"
                },
                {
                    "command": "gitlens.openRepoInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && config.gitlens.advanced.menus.editorTitleContext.remote",
+                    "when": "gitlens:enabled && config.gitlens.advanced.menus.editorTitleContext.remote",
                    "group": "1_gitlens"
                },
                {
@@ -1415,7 +1355,7 @@
            "editor/title/context": [
                {
                    "command": "gitlens.openFileInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && config.gitlens.advanced.menus.editorTitleContext.remote",
+                    "when": "gitlens:enabled && config.gitlens.advanced.menus.editorTitleContext.remote",
                    "group": "1_gitlens"
                },
                {
@@ -1442,7 +1382,7 @@
            "explorer/context": [
                {
                    "command": "gitlens.openFileInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && config.gitlens.advanced.menus.explorerContext.remote",
+                    "when": "gitlens:enabled && config.gitlens.advanced.menus.explorerContext.remote",
                    "group": "navigation@100"
                },
                {
@@ -1471,11 +1411,6 @@
                    "command": "gitlens.closeUnchangedFiles",
                    "when": "gitlens:enabled",
                    "group": "1_gitlens@2"
-                },
-                {
-                    "command": "gitlens.stashSave",
-                    "when": "gitlens:enabled",
-                    "group": "2_gitlens@1"
                }
            ],
            "scm/resourceState/context": [
@@ -1493,11 +1428,6 @@
                    "command": "gitlens.showQuickFileHistory",
                    "when": "gitlens:enabled",
                    "group": "1_gitlens_1@1"
-                },
-                {
-                    "command": "gitlens.stashSave",
-                    "when": "gitlens:enabled",
-                    "group": "2_gitlens@1"
                }
            ],
            "view/title": [
@@ -1523,19 +1453,14 @@
                }
            ],
            "view/item/context": [
-                {
-                    "command": "gitlens.openBranchesInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && view == gitlens.gitExplorer && viewItem == gitlens:branches",
-                    "group": "1_gitlens@1"
-                },
                {
                    "command": "gitlens.openBranchInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && view == gitlens.gitExplorer && viewItem == gitlens:branch-history",
+                    "when": "gitlens:enabled && view == gitlens.gitExplorer && viewItem == gitlens:branch-history",
                    "group": "1_gitlens@1"
                },
                {
                    "command": "gitlens.openCommitInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && view == gitlens.gitExplorer && viewItem == gitlens:commit",
+                    "when": "gitlens:enabled && view == gitlens.gitExplorer && viewItem == gitlens:commit",
                    "group": "1_gitlens@1"
                },
                {
@@ -1585,53 +1510,23 @@
                },
                {
                    "command": "gitlens.openFileInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && view == gitlens.gitExplorer && viewItem == gitlens:commit-file",
+                    "when": "gitlens:enabled && view == gitlens.gitExplorer && viewItem == gitlens:commit-file",
                    "group": "3_gitlens@1"
                },
                {
                    "command": "gitlens.gitExplorer.openFileRevisionInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && view == gitlens.gitExplorer && viewItem == gitlens:commit-file",
-                    "group": "3_gitlens@2"
-                },
-                {
-                    "command": "gitlens.gitExplorer.applyChanges",
                    "when": "gitlens:enabled && view == gitlens.gitExplorer && viewItem == gitlens:commit-file",
-                    "group": "4_gitlens@1"
+                    "group": "3_gitlens@2"
                },
                {
                    "command": "gitlens.showQuickFileHistory",
                    "when": "gitlens:isTracked && view == gitlens.gitExplorer && viewItem == gitlens:commit-file && gitlens:gitExplorer:view == repository",
-                    "group": "5_gitlens@1"
+                    "group": "4_gitlens@1"
                },
                {
                    "command": "gitlens.showQuickCommitFileDetails",
                    "when": "gitlens:enabled && view == gitlens.gitExplorer && viewItem == gitlens:commit-file",
-                    "group": "5_gitlens@2"
-                },
-                {
-                    "command": "gitlens.gitExplorer.openFile",
-                    "when": "gitlens:enabled && view == gitlens.gitExplorer && viewItem == gitlens:file-history",
-                    "group": "1_gitlens@1"
-                },
-                {
-                    "command": "gitlens.openFileInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && view == gitlens.gitExplorer && viewItem == gitlens:file-history",
-                    "group": "1_gitlens@2"
-                },
-                {
-                    "command": "gitlens.openBranchesInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && view == gitlens.gitExplorer && viewItem == gitlens:remote",
-                    "group": "1_gitlens@1"
-                },
-                {
-                    "command": "gitlens.openRepoInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && view == gitlens.gitExplorer && viewItem == gitlens:remote",
-                    "group": "1_gitlens@2"
-                },
-                {
-                    "command": "gitlens.stashSave",
-                    "when": "gitlens:enabled && view == gitlens.gitExplorer && viewItem == gitlens:stashes",
-                    "group": "1_gitlens@1"
+                    "group": "4_gitlens@2"
                },
                {
                    "command": "gitlens.stashApply",
@@ -1680,28 +1575,13 @@
                },
                {
                    "command": "gitlens.openFileInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && view == gitlens.gitExplorer && viewItem == gitlens:stash-file",
-                    "group": "3_gitlens@1"
-                },
-                {
-                    "command": "gitlens.gitExplorer.applyChanges",
                    "when": "gitlens:enabled && view == gitlens.gitExplorer && viewItem == gitlens:stash-file",
-                    "group": "4_gitlens@1"
+                    "group": "3_gitlens@1"
                },
                {
                    "command": "gitlens.showQuickFileHistory",
                    "when": "gitlens:isTracked && view == gitlens.gitExplorer && viewItem == gitlens:stash-file",
-                    "group": "5_gitlens@1"
-                },
-                {
-                    "command": "gitlens.openRepoInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes && view == gitlens.gitExplorer && viewItem == gitlens:status",
-                    "group": "1_gitlens@1"
-                },
-                {
-                    "command": "gitlens.gitExplorer.refresh",
-                    "when": "gitlens:enabled && view == gitlens.gitExplorer && viewItem != gitlens:commit-file && viewItem != gitlens:stash-file",
-                    "group": "9_gitlens@1"
+                    "group": "4_gitlens@1"
                }
            ]
        },
@@ -1824,7 +1704,7 @@
    "dependencies": {
        "applicationinsights": "0.21.0",
        "copy-paste": "1.3.0",
-        "iconv-lite": "0.4.19",
+        "iconv-lite": "0.4.18",
        "ignore": "3.3.5",
        "lodash.debounce": "4.0.8",
        "lodash.escaperegexp": "4.1.2",
@@ -1838,10 +1718,10 @@
    "devDependencies": {
        "@types/copy-paste": "1.1.30",
        "@types/iconv-lite": "0.0.1",
-        "@types/mocha": "2.2.43",
-        "@types/node": "8.0.28",
+        "@types/mocha": "2.2.42",
+        "@types/node": "8.0.26",
        "@types/tmp": "0.0.33",
-        "mocha": "3.5.2",
+        "mocha": "3.5.0",
        "tslint": "5.7.0",
        "typescript": "2.5.2",
        "vscode": "1.1.5"
--- a/src/annotations/annotations.ts
+++ b/src/annotations/annotations.ts
@@ -1,6 +1,5 @@
 import { Strings } from '../system';
-import { DecorationInstanceRenderOptions, DecorationOptions, MarkdownString, ThemableDecorationRenderOptions } from 'vscode';
-import { DiffWithCommand, ShowQuickCommitDetailsCommand } from '../commands';
+import { DecorationInstanceRenderOptions, DecorationOptions, ThemableDecorationRenderOptions } from 'vscode';
 import { IThemeConfig, themeDefaults } from '../configuration';
 import { GlyphChars } from '../constants';
 import { CommitFormatter, GitCommit, GitDiffChunkLine, GitService, GitUri, ICommitFormatOptions } from '../gitService';
@@ -48,7 +47,7 @@ export class Annotations {
        return '#793738';
    }

-    static getHoverMessage(commit: GitCommit, dateFormat: string | null): MarkdownString {
+    static getHoverMessage(commit: GitCommit, dateFormat: string | null): string | string[] {
        if (dateFormat === null) {
            dateFormat = 'MMMM Do, YYYY h:MMa';
        }
@@ -64,21 +63,16 @@ export class Annotations {
                .replace(/\n/g, '  \n');
            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}`);
-        markdown.isTrusted = true;
-        return markdown;
+        return `\`${commit.shortSha}\` &nbsp; __${commit.author}__, ${moment(commit.date).fromNow()} &nbsp; _(${moment(commit.date).format(dateFormat)})_${message}`;
    }

-    static getHoverDiffMessage(commit: GitCommit, chunkLine: GitDiffChunkLine | undefined): MarkdownString | undefined {
+    static getHoverDiffMessage(commit: GitCommit, chunkLine: GitDiffChunkLine | undefined): string | undefined {
        if (chunkLine === undefined) return undefined;

        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}`);
-        markdown.isTrusted = true;
-        return markdown;
+        return commit.isUncommitted
+            ? `\`Changes\` &nbsp; ${GlyphChars.Dash} &nbsp; _uncommitted_\n${codeDiff}`
+            : `\`Changes\` &nbsp; ${GlyphChars.Dash} &nbsp; \`${commit.previousShortSha}\` ${GlyphChars.ArrowLeftRight} \`${commit.shortSha}\`\n${codeDiff}`;
    }

    private static _getCodeDiff(chunkLine: GitDiffChunkLine): string {
@@ -187,10 +181,7 @@ export class Annotations {
    }

    static trailing(commit: GitCommit, format: string, dateFormat: string | null, cfgTheme: IThemeConfig): DecorationOptions {
-        const message = CommitFormatter.fromTemplate(format, commit, {
-            truncateMessageAtNewLine: true,
-            dateFormat: dateFormat
-        } as ICommitFormatOptions);
+        const message = CommitFormatter.fromTemplate(format, commit, dateFormat);
        return {
            renderOptions: {
                after: {
--- a/src/annotations/recentChangesAnnotationProvider.ts
+++ b/src/annotations/recentChangesAnnotationProvider.ts
@@ -1,5 +1,5 @@
 'use strict';
-import { DecorationOptions, ExtensionContext, MarkdownString, Position, Range, TextEditor, TextEditorDecorationType } from 'vscode';
+import { DecorationOptions, ExtensionContext, Position, Range, TextEditor, TextEditorDecorationType } from 'vscode';
 import { Annotations, endOfLineIndex } from './annotations';
 import { FileAnnotationType } from './annotationController';
 import { AnnotationProviderBase } from './annotationProvider';
@@ -48,7 +48,7 @@ export class RecentChangesAnnotationProvider extends AnnotationProviderBase {
                    } as DecorationOptions);
                }

-                let message: MarkdownString | undefined = undefined;
+                let message: string | undefined = undefined;
                if (cfg.hover.changes) {
                    message = Annotations.getHoverDiffMessage(commit, line);
                }
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -8,14 +8,12 @@ export * from './commands/copyShaToClipboard';
 export * from './commands/diffDirectory';
 export * from './commands/diffLineWithPrevious';
 export * from './commands/diffLineWithWorking';
-export * from './commands/diffWith';
 export * from './commands/diffWithBranch';
 export * from './commands/diffWithNext';
 export * from './commands/diffWithPrevious';
 export * from './commands/diffWithRevision';
 export * from './commands/diffWithWorking';
 export * from './commands/openChangedFiles';
-export * from './commands/openBranchesInRemote';
 export * from './commands/openBranchInRemote';
 export * from './commands/openCommitInRemote';
 export * from './commands/openFileInRemote';
--- a/src/commands/common.ts
+++ b/src/commands/common.ts
@@ -1,7 +1,7 @@
 'use strict';
 import { commands, Disposable, SourceControlResourceGroup, SourceControlResourceState, TextDocumentShowOptions, TextEditor, TextEditorEdit, Uri, window, workspace } from 'vscode';
 import { ExplorerNode } from '../views/explorerNodes';
-import { GitBranch, GitCommit, GitRemote } from '../gitService';
+import { GitBranch, GitCommit } from '../gitService';
 import { Logger } from '../logger';
 import { Telemetry } from '../telemetry';

@@ -11,7 +11,6 @@ export type Commands =
    'gitlens.copyMessageToClipboard' |
    'gitlens.copyShaToClipboard' |
    'gitlens.diffDirectory' |
-    'gitlens.diffWith' |
    'gitlens.diffWithBranch' |
    'gitlens.diffWithNext' |
    'gitlens.diffWithPrevious' |
@@ -20,7 +19,6 @@ export type Commands =
    'gitlens.diffWithWorking' |
    'gitlens.diffLineWithWorking' |
    'gitlens.openChangedFiles' |
-    'gitlens.openBranchesInRemote' |
    'gitlens.openBranchInRemote' |
    'gitlens.openCommitInRemote' |
    'gitlens.openFileInRemote' |
@@ -53,7 +51,6 @@ export const Commands = {
    CopyMessageToClipboard: 'gitlens.copyMessageToClipboard' as Commands,
    CopyShaToClipboard: 'gitlens.copyShaToClipboard' as Commands,
    DiffDirectory: 'gitlens.diffDirectory' as Commands,
-    DiffWith: 'gitlens.diffWith' as Commands,
    DiffWithBranch: 'gitlens.diffWithBranch' as Commands,
    DiffWithNext: 'gitlens.diffWithNext' as Commands,
    DiffWithPrevious: 'gitlens.diffWithPrevious' as Commands,
@@ -62,7 +59,6 @@ export const Commands = {
    DiffWithWorking: 'gitlens.diffWithWorking' as Commands,
    DiffLineWithWorking: 'gitlens.diffLineWithWorking' as Commands,
    OpenChangedFiles: 'gitlens.openChangedFiles' as Commands,
-    OpenBranchesInRemote: 'gitlens.openBranchesInRemote' as Commands,
    OpenBranchInRemote: 'gitlens.openBranchInRemote' as Commands,
    OpenCommitInRemote: 'gitlens.openCommitInRemote' as Commands,
    OpenFileInRemote: 'gitlens.openFileInRemote' as Commands,
@@ -142,10 +138,6 @@ export function isCommandViewContextWithCommit<T extends GitCommit>(context: Com
    return context.type === 'view' && (context.node as any).commit && (context.node as any).commit instanceof GitCommit;
 }

-export function isCommandViewContextWithRemote(context: CommandContext): context is CommandViewContext & { node: (ExplorerNode & { remote: GitRemote }) } {
-    return context.type === 'view' && (context.node as any).remote && (context.node as any).remote instanceof GitRemote;
-}
-
 export type CommandContext = CommandScmGroupsContext | CommandScmStatesContext | CommandUnknownContext | CommandUriContext | CommandViewContext;

 function isScmResourceGroup(group: any): group is SourceControlResourceGroup {
@@ -168,10 +160,6 @@ function isTextEditor(editor: any): editor is TextEditor {

 export abstract class Command extends Disposable {

-    static getMarkdownCommandArgsCore<T>(command: Commands, args: T): string {
-        return `command:${command}?${encodeURIComponent(JSON.stringify(args))}`;
-    }
-
    protected readonly contextParsingOptions: CommandContextParsingOptions = { editor: false, uri: false };

    private _disposable: Disposable;
--- a/src/commands/diffLineWithPrevious.ts
+++ b/src/commands/diffLineWithPrevious.ts
@@ -1,14 +1,16 @@
 'use strict';
-import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
+import { commands, Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { ActiveEditorCommand, Commands, getCommandUri } from './common';
-import { DiffWithCommandArgs } from './diffWith';
+import { BuiltInCommands, GlyphChars } from '../constants';
+import { DiffWithPreviousCommandArgs } from './diffWithPrevious';
+import { DiffWithWorkingCommandArgs } from './diffWithWorking';
 import { GitCommit, GitService, GitUri } from '../gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
+import * as path from 'path';

 export interface DiffLineWithPreviousCommandArgs {
    commit?: GitCommit;
-
    line?: number;
    showOptions?: TextDocumentShowOptions;
 }
@@ -41,26 +43,56 @@ export class DiffLineWithPreviousCommand extends ActiveEditorCommand {
                if (blame === undefined) return Messages.showFileNotUnderSourceControlWarningMessage('Unable to open compare');

                args.commit = blame.commit;
+
+                // If we don't have a sha or the current commit matches the blame, show the previous
+                if (gitUri.sha === undefined || gitUri.sha === args.commit.sha) {
+                    return commands.executeCommand(Commands.DiffWithPrevious, new GitUri(uri, args.commit), {
+                        line: args.line,
+                        showOptions: args.showOptions
+                    } as DiffWithPreviousCommandArgs);
+                }
+
+                // If the line is uncommitted, find the previous commit and treat it as a DiffWithWorking
+                if (args.commit.isUncommitted) {
+                    uri = args.commit.uri;
+                    args.commit = new GitCommit(args.commit.type, args.commit.repoPath, args.commit.previousSha!, args.commit.previousFileName!, args.commit.author, args.commit.date, args.commit.message);
+                    args.line = (blame.line.line + 1) + gitUri.offset;
+
+                    return commands.executeCommand(Commands.DiffWithWorking, uri, {
+                        commit: args.commit,
+                        line: args.line,
+                        showOptions: args.showOptions
+                    } as DiffWithWorkingCommandArgs);
+                }
            }
            catch (ex) {
-                Logger.error(ex, 'DiffLineWithPreviousCommand', `getBlameForLine(${blameline})`);
+                Logger.error(ex, 'DiffWithPreviousLineCommand', `getBlameForLine(${blameline})`);
                return window.showErrorMessage(`Unable to open compare. See output channel for more details`);
            }
        }

-        const diffArgs: DiffWithCommandArgs = {
-            repoPath: args.commit.repoPath,
-            lhs: {
-                sha: args.commit.previousSha !== undefined ? args.commit.previousSha : GitService.fakeSha,
-                uri: args.commit.previousUri
-            },
-            rhs: {
-                sha: args.commit.sha,
-                uri: args.commit.uri
-            },
-            line: args.line,
-            showOptions: args.showOptions
-        };
-        return commands.executeCommand(Commands.DiffWith, diffArgs);
+        try {
+            const [rhs, lhs] = await Promise.all([
+                this.git.getVersionedFile(gitUri.repoPath, gitUri.fsPath, gitUri.sha!),
+                this.git.getVersionedFile(args.commit.repoPath, args.commit.uri.fsPath, args.commit.sha)
+            ]);
+
+            if (args.line !== undefined && args.line !== 0) {
+                if (args.showOptions === undefined) {
+                    args.showOptions = {};
+                }
+                args.showOptions.selection = new Range(args.line, 0, args.line, 0);
+            }
+
+            await commands.executeCommand(BuiltInCommands.Diff,
+                Uri.file(lhs),
+                Uri.file(rhs),
+                `${path.basename(args.commit.uri.fsPath)} (${args.commit.shortSha}) ${GlyphChars.ArrowLeftRight} ${path.basename(gitUri.fsPath)} (${gitUri.shortSha})`,
+                args.showOptions);
+        }
+        catch (ex) {
+            Logger.error(ex, 'DiffWithPreviousLineCommand', 'getVersionedFile');
+            return window.showErrorMessage(`Unable to open compare. See output channel for more details`);
+        }
    }
 }
--- a/src/commands/diffLineWithWorking.ts
+++ b/src/commands/diffLineWithWorking.ts
@@ -1,14 +1,13 @@
 'use strict';
 import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { ActiveEditorCommand, Commands, getCommandUri } from './common';
-import { DiffWithCommandArgs } from './diffWith';
+import { DiffWithWorkingCommandArgs } from './diffWithWorking';
 import { GitCommit, GitService, GitUri } from '../gitService';
 import { Messages } from '../messages';
 import { Logger } from '../logger';

 export interface DiffLineWithWorkingCommandArgs {
    commit?: GitCommit;
-
    line?: number;
    showOptions?: TextDocumentShowOptions;
 }
@@ -53,19 +52,6 @@ export class DiffLineWithWorkingCommand extends ActiveEditorCommand {
            }
        }

-        const diffArgs: DiffWithCommandArgs = {
-            repoPath: args.commit.repoPath,
-            lhs: {
-                sha: args.commit.sha,
-                uri: args.commit.uri
-            },
-            rhs: {
-                sha: '',
-                uri: args.commit.uri
-            },
-            line: args.line,
-            showOptions: args.showOptions
-        };
-        return commands.executeCommand(Commands.DiffWith, diffArgs);
+        return commands.executeCommand(Commands.DiffWithWorking, uri, args as DiffWithWorkingCommandArgs);
    }
 }
--- a/src/commands/diffWith.ts
+++ b/src/commands/diffWith.ts
@@ -1,150 +0,0 @@
-'use strict';
-import { commands, Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
-import { ActiveEditorCommand, Commands } from './common';
-import { BuiltInCommands, GlyphChars } from '../constants';
-import { GitCommit, GitService } from '../gitService';
-import { Logger } from '../logger';
-import * as path from 'path';
-
-export interface DiffWithCommandArgsRevision {
-    sha: string;
-    uri: Uri;
-    title?: string;
-}
-
-export interface DiffWithCommandArgs {
-    lhs?: DiffWithCommandArgsRevision;
-    rhs?: DiffWithCommandArgsRevision;
-    repoPath?: string;
-
-    line?: number;
-    showOptions?: TextDocumentShowOptions;
-}
-
-export class DiffWithCommand extends ActiveEditorCommand {
-
-    static getMarkdownCommandArgs(args: DiffWithCommandArgs): string;
-    static getMarkdownCommandArgs(commit1: GitCommit, commit2: GitCommit): string;
-    static getMarkdownCommandArgs(argsOrCommit1: DiffWithCommandArgs | GitCommit, commit2?: GitCommit): string {
-        let args = argsOrCommit1;
-        if (argsOrCommit1 instanceof GitCommit) {
-            const commit1 = argsOrCommit1;
-
-            if (commit2 === undefined) {
-                if (commit1.isUncommitted) {
-                    args = {
-                        repoPath: commit1.repoPath,
-                        lhs: {
-                            sha: 'HEAD',
-                            uri: commit1.uri
-                        },
-                        rhs: {
-                            sha: '',
-                            uri: commit1.uri
-                        }
-                    };
-                }
-                else {
-                    args = {
-                        repoPath: commit1.repoPath,
-                        lhs: {
-                            sha: commit1.previousSha!,
-                            uri: commit1.previousUri!
-                        },
-                        rhs: {
-                            sha: commit1.sha,
-                            uri: commit1.uri
-                        }
-                    };
-                }
-            }
-            else {
-                args = {
-                    repoPath: commit1.repoPath,
-                    lhs: {
-                        sha: commit1.sha,
-                        uri: commit1.uri
-                    },
-                    rhs: {
-                        sha: commit2.sha,
-                        uri: commit2.uri
-                    }
-                };
-            }
-        }
-
-        return super.getMarkdownCommandArgsCore<DiffWithCommandArgs>(Commands.DiffWith, args);
-    }
-
-    constructor(private git: GitService) {
-        super(Commands.DiffWith);
-    }
-
-    async execute(editor?: TextEditor, uri?: Uri, args: DiffWithCommandArgs = {}): Promise<any> {
-        args = { ...args };
-        if (args.repoPath === undefined || args.lhs === undefined || args.rhs === undefined) return undefined;
-
-        try {
-            const [lhs, rhs] = await Promise.all([
-                args.lhs.sha !== '' && !GitService.isUncommitted(args.lhs.sha)
-                    ? this.git.getVersionedFile(args.repoPath, args.lhs.uri.fsPath, args.lhs.sha)
-                    : args.lhs.uri.fsPath,
-                args.rhs.sha !== '' && !GitService.isUncommitted(args.rhs.sha)
-                    ? this.git.getVersionedFile(args.repoPath, args.rhs.uri.fsPath, args.rhs.sha)
-                    : args.rhs.uri.fsPath
-            ]);
-
-            if (args.line !== undefined && args.line !== 0) {
-                if (args.showOptions === undefined) {
-                    args.showOptions = {};
-                }
-                args.showOptions.selection = new Range(args.line, 0, args.line, 0);
-            }
-
-            let lhsPrefix = '';
-            if (lhs === undefined) {
-                lhsPrefix = 'deleted in ';
-            }
-            else if (args.rhs.sha === GitService.fakeSha) {
-                lhsPrefix = 'added in ';
-            }
-
-            let rhsPrefix = '';
-            if (rhs === undefined) {
-                rhsPrefix = 'deleted in ';
-            }
-            else if (args.lhs.sha === GitService.fakeSha) {
-                rhsPrefix = 'added in ';
-            }
-
-            if (args.lhs.title === undefined && args.lhs.sha !== GitService.fakeSha) {
-                args.lhs.title = (args.lhs.sha === '' || GitService.isUncommitted(args.lhs.sha))
-                    ? `${path.basename(args.lhs.uri.fsPath)}`
-                    : `${path.basename(args.lhs.uri.fsPath)} (${lhsPrefix}${GitService.shortenSha(args.lhs.sha)})`;
-            }
-            if (args.rhs.title === undefined && args.rhs.sha !== GitService.fakeSha) {
-                args.rhs.title = (args.rhs.sha === '' || GitService.isUncommitted(args.rhs.sha))
-                ? `${path.basename(args.rhs.uri.fsPath)}`
-                : `${path.basename(args.rhs.uri.fsPath)} (${rhsPrefix}${GitService.shortenSha(args.rhs.sha)})`;
-            }
-
-            const title = (args.lhs.title !== undefined && args.rhs.title !== undefined)
-                ? `${args.lhs.title} ${GlyphChars.ArrowLeftRight} ${args.rhs.title}`
-                : args.lhs.title || args.rhs.title;
-
-            return await commands.executeCommand(BuiltInCommands.Diff,
-                lhs === undefined
-                    ? GitService.toGitContentUri(GitService.fakeSha, args.lhs.uri.fsPath, args.repoPath)
-                    : Uri.file(lhs),
-                rhs === undefined
-                    ? GitService.toGitContentUri(GitService.fakeSha, args.rhs.uri.fsPath, args.repoPath)
-                    : Uri.file(rhs),
-                title,
-                args.showOptions);
-        }
-        catch (ex) {
-            Logger.error(ex, 'DiffWithCommand', 'getVersionedFile');
-            return window.showErrorMessage(`Unable to open compare. See output channel for more details`);
-        }
-    }
-}
--- a/src/commands/diffWithBranch.ts
+++ b/src/commands/diffWithBranch.ts
@@ -1,9 +1,9 @@
 'use strict';
-import { commands, TextDocumentShowOptions, TextEditor, Uri } from 'vscode';
+import { commands, Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { ActiveEditorCommand, Commands, getCommandUri } from './common';
-import { GlyphChars } from '../constants';
-import { DiffWithCommandArgs } from './diffWith';
+import { BuiltInCommands, GlyphChars } from '../constants';
 import { GitService, GitUri } from '../gitService';
+import { Logger } from '../logger';
 import { Messages } from '../messages';
 import { BranchesQuickPick, CommandQuickPickItem } from '../quickPicks';
 import * as path from 'path';
@@ -42,20 +42,25 @@ export class DiffWithBranchCommand extends ActiveEditorCommand {
        const branch = pick.branch.name;
        if (branch === undefined) return undefined;

-        const diffArgs: DiffWithCommandArgs = {
-            repoPath: gitUri.repoPath,
-            lhs: {
-                sha: pick.branch.remote ? `remotes/${branch}` : branch,
-                uri: gitUri as Uri,
-                title: `${path.basename(gitUri.fsPath)} (${branch})`
-            },
-            rhs: {
-                sha: '',
-                uri: gitUri as Uri
-            },
-            line: args.line,
-            showOptions: args.showOptions
-        };
-        return commands.executeCommand(Commands.DiffWith, diffArgs);
+        try {
+            const compare = await this.git.getVersionedFile(gitUri.repoPath, gitUri.fsPath, branch);
+
+            if (args.line !== undefined && args.line !== 0) {
+                if (args.showOptions === undefined) {
+                    args.showOptions = {};
+                }
+                args.showOptions.selection = new Range(args.line, 0, args.line, 0);
+            }
+
+            await commands.executeCommand(BuiltInCommands.Diff,
+                Uri.file(compare),
+                gitUri.fileUri(),
+                `${path.basename(gitUri.fsPath)} (${branch}) ${GlyphChars.ArrowLeftRight} ${path.basename(gitUri.fsPath)}`,
+                args.showOptions);
+        }
+        catch (ex) {
+            Logger.error(ex, 'DiffWithBranchCommand', 'getVersionedFile');
+            return window.showErrorMessage(`Unable to open branch compare. See output channel for more details`);
+        }
    }
 }
--- a/src/commands/diffWithNext.ts
+++ b/src/commands/diffWithNext.ts
@@ -2,16 +2,16 @@
 import { Iterables } from '../system';
 import { commands, Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { ActiveEditorCommand, Commands, getCommandUri } from './common';
-import { DiffWithCommandArgs } from './diffWith';
+import { BuiltInCommands, GlyphChars } from '../constants';
 import { GitLogCommit, GitService, GitUri } from '../gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
+import * as path from 'path';

 export interface DiffWithNextCommandArgs {
    commit?: GitLogCommit;
-    range?: Range;
-
    line?: number;
+    range?: Range;
    showOptions?: TextDocumentShowOptions;
 }

@@ -54,19 +54,28 @@ export class DiffWithNextCommand extends ActiveEditorCommand {

        if (args.commit.nextSha === undefined) return commands.executeCommand(Commands.DiffWithWorking, uri);

-        const diffArgs: DiffWithCommandArgs = {
-            repoPath: args.commit.repoPath,
-            lhs: {
-                sha: args.commit.sha,
-                uri: args.commit.uri
-            },
-            rhs: {
-                sha: args.commit.nextSha,
-                uri: args.commit.nextUri
-            },
-            line: args.line,
-            showOptions: args.showOptions
-        };
-        return commands.executeCommand(Commands.DiffWith, diffArgs);
+        try {
+            const [rhs, lhs] = await Promise.all([
+                this.git.getVersionedFile(args.commit.repoPath, args.commit.nextUri.fsPath, args.commit.nextSha),
+                this.git.getVersionedFile(args.commit.repoPath, args.commit.uri.fsPath, args.commit.sha)
+            ]);
+
+            if (args.line !== undefined && args.line !== 0) {
+                if (args.showOptions === undefined) {
+                    args.showOptions = {};
+                }
+                args.showOptions.selection = new Range(args.line, 0, args.line, 0);
+            }
+
+            await commands.executeCommand(BuiltInCommands.Diff,
+                Uri.file(lhs),
+                Uri.file(rhs),
+                `${path.basename(args.commit.uri.fsPath)} (${args.commit.shortSha}) ${GlyphChars.ArrowLeftRight} ${path.basename(args.commit.nextUri.fsPath)} (${args.commit.nextShortSha})`,
+                args.showOptions);
+        }
+        catch (ex) {
+            Logger.error(ex, 'DiffWithNextCommand', 'getVersionedFile');
+            return window.showErrorMessage(`Unable to open compare. See output channel for more details`);
+        }
    }
 }
--- a/src/commands/diffWithPrevious.ts
+++ b/src/commands/diffWithPrevious.ts
@@ -2,18 +2,22 @@
 import { Iterables } from '../system';
 import { commands, Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { ActiveEditorCommand, Commands, getCommandUri } from './common';
-import { DiffWithCommandArgs } from './diffWith';
+import { BuiltInCommands, FakeSha, GlyphChars } from '../constants';
 import { DiffWithWorkingCommandArgs } from './diffWithWorking';
 import { GitCommit, GitService, GitUri } from '../gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
+import * as path from 'path';

 export interface DiffWithPreviousCommandArgs {
    commit?: GitCommit;
-    range?: Range;
-
    line?: number;
+    range?: Range;
    showOptions?: TextDocumentShowOptions;
+
+    allowMissingPrevious?: boolean;
+    leftTitlePrefix?: string;
+    rightTitlePrefix?: string;
 }

 export class DiffWithPreviousCommand extends ActiveEditorCommand {
@@ -36,7 +40,6 @@ export class DiffWithPreviousCommand extends ActiveEditorCommand {

            try {
                const sha = args.commit === undefined ? gitUri.sha : args.commit.sha;
-                if (sha === GitService.fakeSha) return Messages.showCommitHasNoPreviousCommitWarningMessage();

                const log = await this.git.getLogForFile(gitUri.repoPath, gitUri.fsPath, sha, { maxCount: 2, range: args.range!, skipMerges: true });
                if (log === undefined) return Messages.showFileNotUnderSourceControlWarningMessage('Unable to open compare');
@@ -44,9 +47,7 @@ export class DiffWithPreviousCommand extends ActiveEditorCommand {
                args.commit = (sha && log.commits.get(sha)) || Iterables.first(log.commits.values());

                // If the sha is missing and the file is uncommitted, then treat it as a DiffWithWorking
-                if (gitUri.sha === undefined && await this.git.isFileUncommitted(gitUri)) {
-                    return commands.executeCommand(Commands.DiffWithWorking, uri, { commit: args.commit, showOptions: args.showOptions } as DiffWithWorkingCommandArgs);
-                }
+                if (gitUri.sha === undefined && await this.git.isFileUncommitted(gitUri)) return commands.executeCommand(Commands.DiffWithWorking, uri, { commit: args.commit, showOptions: args.showOptions } as DiffWithWorkingCommandArgs);
            }
            catch (ex) {
                Logger.error(ex, 'DiffWithPreviousCommand', `getLogForFile(${gitUri.repoPath}, ${gitUri.fsPath})`);
@@ -54,19 +55,32 @@ export class DiffWithPreviousCommand extends ActiveEditorCommand {
            }
        }

-        const diffArgs: DiffWithCommandArgs = {
-            repoPath: args.commit.repoPath,
-            lhs: {
-                sha: args.commit.previousSha !== undefined ? args.commit.previousSha : GitService.fakeSha,
-                uri: args.commit.previousUri
-            },
-            rhs: {
-                sha: args.commit.sha,
-                uri: args.commit.uri
-            },
-            line: args.line,
-            showOptions: args.showOptions
-        };
-        return commands.executeCommand(Commands.DiffWith, diffArgs);
+        if (args.commit.previousSha === undefined && !args.allowMissingPrevious) return Messages.showCommitHasNoPreviousCommitWarningMessage(args.commit);
+
+        try {
+            const [rhs, lhs] = await Promise.all([
+                this.git.getVersionedFile(args.commit.repoPath, args.commit.uri.fsPath, args.commit.sha),
+                this.git.getVersionedFile(args.commit.repoPath, args.commit.previousUri.fsPath, args.commit.previousSha === undefined ? FakeSha : args.commit.previousSha)
+            ]);
+
+            if (args.line !== undefined && args.line !== 0) {
+                if (args.showOptions === undefined) {
+                    args.showOptions = {};
+                }
+                args.showOptions.selection = new Range(args.line, 0, args.line, 0);
+            }
+
+            await commands.executeCommand(BuiltInCommands.Diff,
+                Uri.file(lhs),
+                Uri.file(rhs),
+                args.commit.previousShortSha === undefined
+                    ? `${path.basename(args.commit.uri.fsPath)} (${args.rightTitlePrefix || ''}${args.commit.shortSha})`
+                    : `${path.basename(args.commit.previousUri.fsPath)} (${args.leftTitlePrefix || ''}${args.commit.previousShortSha}) ${GlyphChars.ArrowLeftRight} ${path.basename(args.commit.uri.fsPath)} (${args.rightTitlePrefix || ''}${args.commit.shortSha})`,
+                args.showOptions);
+        }
+        catch (ex) {
+            Logger.error(ex, 'DiffWithPreviousCommand', 'getVersionedFile');
+            return window.showErrorMessage(`Unable to open compare. See output channel for more details`);
+        }
    }
 }
--- a/src/commands/diffWithRevision.ts
+++ b/src/commands/diffWithRevision.ts
@@ -1,16 +1,16 @@
 'use strict';
-import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
+import { commands, Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { ActiveEditorCommand, Commands, getCommandUri } from './common';
-import { DiffWithCommandArgs } from './diffWith';
+import { BuiltInCommands, GlyphChars } from '../constants';
 import { GitService, GitUri } from '../gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
 import { CommandQuickPickItem, FileHistoryQuickPick } from '../quickPicks';
+import * as path from 'path';

 export interface DiffWithRevisionCommandArgs {
-    maxCount?: number;
-
    line?: number;
+    maxCount?: number;
    showOptions?: TextDocumentShowOptions;
 }

@@ -46,24 +46,24 @@ export class DiffWithRevisionCommand extends ActiveEditorCommand {

            if (pick instanceof CommandQuickPickItem) return pick.execute();

-            const diffArgs: DiffWithCommandArgs = {
-                repoPath: gitUri.repoPath,
-                lhs: {
-                    sha: pick.commit.sha,
-                    uri: gitUri as Uri
-                },
-                rhs: {
-                    sha: '',
-                    uri: gitUri as Uri
-                },
-                line: args.line,
-                showOptions: args.showOptions
-            };
-            return await commands.executeCommand(Commands.DiffWith, diffArgs);
+            const compare = await this.git.getVersionedFile(gitUri.repoPath, gitUri.fsPath, pick.commit.sha);
+
+            if (args.line !== undefined && args.line !== 0) {
+                if (args.showOptions === undefined) {
+                    args.showOptions = {};
+                }
+                args.showOptions.selection = new Range(args.line, 0, args.line, 0);
+            }
+
+            await commands.executeCommand(BuiltInCommands.Diff,
+                Uri.file(compare),
+                gitUri.fileUri(),
+                `${path.basename(gitUri.fsPath)} (${pick.commit.shortSha}) ${GlyphChars.ArrowLeftRight} ${path.basename(gitUri.fsPath)}`,
+                args.showOptions);
        }
        catch (ex) {
-            Logger.error(ex, 'DiffWithRevisionCommand');
-            return window.showErrorMessage(`Unable to open compare. See output channel for more details`);
+            Logger.error(ex, 'DiffWithRevisionCommand', 'getVersionedFile');
+            return window.showErrorMessage(`Unable to open history compare. See output channel for more details`);
        }
    }
 }
--- a/src/commands/diffWithWorking.ts
+++ b/src/commands/diffWithWorking.ts
@@ -1,14 +1,14 @@
 'use strict';
-import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
+import { commands, Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { ActiveEditorCommand, Commands, getCommandUri } from './common';
-import { DiffWithCommandArgs } from './diffWith';
+import { BuiltInCommands, GlyphChars } from '../constants';
 import { GitCommit, GitService, GitUri } from '../gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
+import * as path from 'path';

 export interface DiffWithWorkingCommandArgs {
    commit?: GitCommit;
-
    line?: number;
    showOptions?: TextDocumentShowOptions;
 }
@@ -48,19 +48,25 @@ export class DiffWithWorkingCommand extends ActiveEditorCommand {
        const workingFileName = await this.git.findWorkingFileName(gitUri.repoPath, gitUri.fsPath);
        if (workingFileName === undefined) return undefined;

-        const diffArgs: DiffWithCommandArgs = {
-            repoPath: args.commit.repoPath,
-            lhs: {
-                sha: args.commit.sha,
-                uri: args.commit.uri
-            },
-            rhs: {
-                sha: '',
-                uri: args.commit.uri
-            },
-            line: args.line,
-            showOptions: args.showOptions
-        };
-        return commands.executeCommand(Commands.DiffWith, diffArgs);
+        try {
+            const compare = await this.git.getVersionedFile(args.commit.repoPath, args.commit.uri.fsPath, args.commit.sha);
+
+            if (args.line !== undefined && args.line !== 0) {
+                if (args.showOptions === undefined) {
+                    args.showOptions = {};
+                }
+                args.showOptions.selection = new Range(args.line, 0, args.line, 0);
+            }
+
+            await commands.executeCommand(BuiltInCommands.Diff,
+                Uri.file(compare),
+                Uri.file(path.resolve(gitUri.repoPath, workingFileName)),
+                `${path.basename(args.commit.uri.fsPath)} (${args.commit.shortSha}) ${GlyphChars.ArrowLeftRight} ${path.basename(workingFileName)}`,
+                args.showOptions);
+        }
+        catch (ex) {
+            Logger.error(ex, 'DiffWithWorkingCommand', 'getVersionedFile');
+            return window.showErrorMessage(`Unable to open compare. See output channel for more details`);
+        }
    }
 }
--- a/src/commands/openBranchInRemote.ts
+++ b/src/commands/openBranchInRemote.ts
@@ -10,7 +10,6 @@ import { OpenInRemoteCommandArgs } from './openInRemote';

 export interface OpenBranchInRemoteCommandArgs {
    branch?: string;
-    remote?: string;
 }

 export class OpenBranchInRemoteCommand extends ActiveEditorCommand {
@@ -23,7 +22,7 @@ export class OpenBranchInRemoteCommand extends ActiveEditorCommand {
        if (isCommandViewContextWithBranch(context)) {
            args = { ...args };
            args.branch = context.node.branch.name;
-            args.remote = context.node.branch.getRemote();
+            return this.execute(context.editor, context.uri, args);
        }

        return this.execute(context.editor, context.uri, args);
@@ -58,7 +57,6 @@ export class OpenBranchInRemoteCommand extends ActiveEditorCommand {
                    type: 'branch',
                    branch: args.branch
                },
-                remote: args.remote,
                remotes
            } as OpenInRemoteCommandArgs);
        }
--- a/src/commands/openBranchesInRemote.ts
+++ b/src/commands/openBranchesInRemote.ts
@@ -1,52 +0,0 @@
-'use strict';
-import { Arrays } from '../system';
-import { commands, TextEditor, Uri, window } from 'vscode';
-import { ActiveEditorCommand, CommandContext, Commands, getCommandUri, isCommandViewContextWithRemote } from './common';
-import { GitService, GitUri } from '../gitService';
-import { Logger } from '../logger';
-import { OpenInRemoteCommandArgs } from './openInRemote';
-
-export interface OpenBranchesInRemoteCommandArgs {
-    remote?: string;
-}
-
-export class OpenBranchesInRemoteCommand extends ActiveEditorCommand {
-
-    constructor(private git: GitService) {
-        super(Commands.OpenBranchesInRemote);
-    }
-
-    protected async preExecute(context: CommandContext, args: OpenBranchesInRemoteCommandArgs = {}): Promise<any> {
-        if (isCommandViewContextWithRemote(context)) {
-            args = { ...args };
-            args.remote = context.node.remote.name;
-        }
-
-        return this.execute(context.editor, context.uri, args);
-    }
-
-    async execute(editor?: TextEditor, uri?: Uri, args: OpenBranchesInRemoteCommandArgs = {}) {
-        uri = getCommandUri(uri, editor);
-
-        const gitUri = uri && await GitUri.fromUri(uri, this.git);
-
-        const repoPath = gitUri === undefined ? this.git.repoPath : gitUri.repoPath;
-        if (!repoPath) return undefined;
-
-        try {
-            const remotes = Arrays.uniqueBy(await this.git.getRemotes(repoPath), r => r.url, r => !!r.provider);
-
-            return commands.executeCommand(Commands.OpenInRemote, uri, {
-                resource: {
-                    type: 'branches'
-                },
-                remote: args.remote,
-                remotes
-            } as OpenInRemoteCommandArgs);
-        }
-        catch (ex) {
-            Logger.error(ex, 'OpenBranchesInRemoteCommand');
-            return window.showErrorMessage(`Unable to open branches in remote provider. See output channel for more details`);
-        }
-    }
-}
--- a/src/commands/openFileInRemote.ts
+++ b/src/commands/openFileInRemote.ts
@@ -16,7 +16,7 @@ export class OpenFileInRemoteCommand extends ActiveEditorCommand {
        super(Commands.OpenFileInRemote);
    }

-    protected async preExecute(context: CommandContext, args: OpenFileInRemoteCommandArgs = { range: true }): Promise<any> {
+    protected async preExecute(context: CommandContext, args: OpenFileInRemoteCommandArgs = {}): Promise<any> {
        if (isCommandViewContextWithCommit(context)) {
            args = { ...args };
            args.range = false;
--- a/src/commands/openInRemote.ts
+++ b/src/commands/openInRemote.ts
@@ -3,12 +3,11 @@ import { Strings } from '../system';
 import { TextEditor, Uri, window } from 'vscode';
 import { ActiveEditorCommand, Commands, getCommandUri } from './common';
 import { GlyphChars } from '../constants';
-import { GitLogCommit, GitRemote, GitService, RemoteResource } from '../gitService';
+import { GitLogCommit, GitRemote, RemoteResource } from '../gitService';
 import { Logger } from '../logger';
 import { CommandQuickPickItem, OpenRemoteCommandQuickPickItem, RemotesQuickPick } from '../quickPicks';

 export interface OpenInRemoteCommandArgs {
-    remote?: string;
    remotes?: GitRemote[];
    resource?: RemoteResource;

@@ -27,14 +26,6 @@ export class OpenInRemoteCommand extends ActiveEditorCommand {
        args = { ...args };
        if (args.remotes === undefined || args.resource === undefined) return undefined;

-        if (args.remote !== undefined) {
-            const remotes = args.remotes.filter(r => r.name === args.remote);
-            // Only filter if we get some results
-            if (remotes.length > 0) {
-                args.remotes = remotes;
-            }
-        }
-
        try {
            if (args.remotes.length === 1) {
                this.ensureRemoteBranchName(args);
@@ -50,7 +41,7 @@ export class OpenInRemoteCommand extends ActiveEditorCommand {
                    break;

                case 'commit':
-                    const shortSha = GitService.shortenSha(args.resource.sha);
+                    const shortSha = args.resource.sha.substring(0, 8);
                    placeHolder = `open commit ${shortSha} in${GlyphChars.Ellipsis}`;
                    break;

@@ -70,7 +61,7 @@ export class OpenInRemoteCommand extends ActiveEditorCommand {
                        }
                    }
                    else {
-                        const shortFileSha = args.resource.sha === undefined ? '' : GitService.shortenSha(args.resource.sha);
+                        const shortFileSha = args.resource.sha === undefined ? '' : args.resource.sha.substring(0, 8);
                        const shaSuffix = shortFileSha ? ` ${Strings.pad(GlyphChars.Dot, 1, 1)} ${shortFileSha}` : '';

                        placeHolder = `open ${args.resource.fileName}${shaSuffix} in${GlyphChars.Ellipsis}`;
--- a/src/commands/openRepoInRemote.ts
+++ b/src/commands/openRepoInRemote.ts
@@ -1,31 +1,18 @@
 'use strict';
 import { Arrays } from '../system';
 import { commands, TextEditor, Uri, window } from 'vscode';
-import { ActiveEditorCommand, CommandContext, Commands, getCommandUri, isCommandViewContextWithRemote } from './common';
+import { ActiveEditorCommand, Commands, getCommandUri } from './common';
 import { GitService, GitUri } from '../gitService';
 import { Logger } from '../logger';
 import { OpenInRemoteCommandArgs } from './openInRemote';

-export interface OpenRepoInRemoteCommandArgs {
-    remote?: string;
-}
-
 export class OpenRepoInRemoteCommand extends ActiveEditorCommand {

    constructor(private git: GitService) {
        super(Commands.OpenRepoInRemote);
    }

-    protected async preExecute(context: CommandContext, args: OpenRepoInRemoteCommandArgs = {}): Promise<any> {
-        if (isCommandViewContextWithRemote(context)) {
-            args = { ...args };
-            args.remote = context.node.remote.name;
-        }
-
-        return this.execute(context.editor, context.uri, args);
-    }
-
-    async execute(editor?: TextEditor, uri?: Uri, args: OpenRepoInRemoteCommandArgs = {}) {
+    async execute(editor?: TextEditor, uri?: Uri) {
        uri = getCommandUri(uri, editor);

        const gitUri = uri && await GitUri.fromUri(uri, this.git);
@@ -34,13 +21,11 @@ export class OpenRepoInRemoteCommand extends ActiveEditorCommand {
        if (!repoPath) return undefined;

        try {
-            const remotes = Arrays.uniqueBy(await this.git.getRemotes(repoPath), r => r.url, r => !!r.provider);
-
+            const remotes = Arrays.uniqueBy(await this.git.getRemotes(repoPath), _ => _.url, _ => !!_.provider);
            return commands.executeCommand(Commands.OpenInRemote, uri, {
                resource: {
                    type: 'repo'
                },
-                remote: args.remote,
                remotes
            } as OpenInRemoteCommandArgs);
        }
--- a/src/commands/showQuickCommitDetails.ts
+++ b/src/commands/showQuickCommitDetails.ts
@@ -20,29 +20,20 @@ export interface ShowQuickCommitDetailsCommandArgs {

 export class ShowQuickCommitDetailsCommand extends ActiveEditorCachedCommand {

-    static getMarkdownCommandArgs(sha: string): string;
-    static getMarkdownCommandArgs(args: ShowQuickCommitDetailsCommandArgs): string;
-    static getMarkdownCommandArgs(argsOrSha: ShowQuickCommitDetailsCommandArgs | string): string {
-        const args = typeof argsOrSha === 'string'
-            ? { sha: argsOrSha }
-            : argsOrSha;
-        return super.getMarkdownCommandArgsCore<ShowQuickCommitDetailsCommandArgs>(Commands.ShowQuickCommitDetails, args);
-    }
-
    constructor(private git: GitService) {
        super(Commands.ShowQuickCommitDetails);
    }

-    protected async preExecute(context: CommandContext, args: ShowQuickCommitDetailsCommandArgs = {}): Promise<any> {
+    protected async preExecute(context: CommandContext, ...args: any[]): Promise<any> {
        if (context.type === 'view') {
-            args = { ...args };
-            args.sha = context.node.uri.sha;
-
            if (isCommandViewContextWithCommit(context)) {
-                args.commit = context.node.commit;
+                args = [{ sha: context.node.uri.sha, commit: context.node.commit }];
+            }
+            else {
+                args = [{ sha: context.node.uri.sha }];
            }
        }
-        return this.execute(context.editor, context.uri, args);
+        return this.execute(context.editor, context.uri, ...args);
    }

    async execute(editor?: TextEditor, uri?: Uri, args: ShowQuickCommitDetailsCommandArgs = {}) {
--- a/src/commands/showQuickCommitFileDetails.ts
+++ b/src/commands/showQuickCommitFileDetails.ts
@@ -20,29 +20,20 @@ export interface ShowQuickCommitFileDetailsCommandArgs {

 export class ShowQuickCommitFileDetailsCommand extends ActiveEditorCachedCommand {

-    static getMarkdownCommandArgs(sha: string): string;
-    static getMarkdownCommandArgs(args: ShowQuickCommitFileDetailsCommandArgs): string;
-    static getMarkdownCommandArgs(argsOrSha: ShowQuickCommitFileDetailsCommandArgs | string): string {
-        const args = typeof argsOrSha === 'string'
-            ? { sha: argsOrSha }
-            : argsOrSha;
-        return super.getMarkdownCommandArgsCore<ShowQuickCommitFileDetailsCommandArgs>(Commands.ShowQuickCommitFileDetails, args);
-    }
-
    constructor(private git: GitService) {
        super(Commands.ShowQuickCommitFileDetails);
    }

-    protected async preExecute(context: CommandContext, args: ShowQuickCommitFileDetailsCommandArgs = {}): Promise<any> {
+    protected async preExecute(context: CommandContext, ...args: any[]): Promise<any> {
        if (context.type === 'view') {
-            args = { ...args };
-            args.sha = context.node.uri.sha;
-
            if (isCommandViewContextWithCommit(context)) {
-                args.commit = context.node.commit;
+                args = [{ sha: context.node.uri.sha, commit: context.node.commit }];
+            }
+            else {
+                args = [{ sha: context.node.uri.sha }];
            }
        }
-        return this.execute(context.editor, context.uri, args);
+        return this.execute(context.editor, context.uri, ...args);
    }

    async execute(editor?: TextEditor, uri?: Uri, args: ShowQuickCommitFileDetailsCommandArgs = {}) {
@@ -104,7 +95,7 @@ export class ShowQuickCommitFileDetailsCommand extends ActiveEditorCachedCommand
            args.commit.workingFileName = workingFileName;
            args.commit.workingFileName = await this.git.findWorkingFileName(args.commit);

-            const shortSha = GitService.shortenSha(args.sha!);
+            const shortSha = args.sha!.substring(0, 8);

            if (args.goBackCommand === undefined) {
                // Create a command to get back to the commit details
--- a/src/commands/stashApply.ts
+++ b/src/commands/stashApply.ts
@@ -28,7 +28,7 @@ export class StashApplyCommand extends Command {
            return this.execute(args);
        }

-        return this.execute(args);
+        return super.preExecute(context, args);
    }

    async execute(args: StashApplyCommandArgs = { confirm: true, deleteAfter: false }) {
--- a/src/commands/stashDelete.ts
+++ b/src/commands/stashDelete.ts
@@ -26,7 +26,7 @@ export class StashDeleteCommand extends Command {
            return this.execute(args);
        }

-        return this.execute(args);
+        return super.preExecute(context, args);
    }

    async execute(args: StashDeleteCommandArgs = { confirm: true }) {
--- a/src/commands/stashSave.ts
+++ b/src/commands/stashSave.ts
@@ -1,14 +1,13 @@
 'use strict';
-import { InputBoxOptions, Uri, window } from 'vscode';
+import { InputBoxOptions, window } from 'vscode';
 import { GitService } from '../gitService';
-import { CommandContext } from '../commands';
 import { Command, Commands } from './common';
 import { Logger } from '../logger';
 import { CommandQuickPickItem } from '../quickPicks';

 export interface StashSaveCommandArgs {
    message?: string;
-    uris?: Uri[];
+    unstagedOnly?: boolean;

    goBackCommand?: CommandQuickPickItem;
 }
@@ -19,28 +18,16 @@ export class StashSaveCommand extends Command {
        super(Commands.StashSave);
    }

-    protected async preExecute(context: CommandContext, args: StashSaveCommandArgs = {}): Promise<any> {
-        if (context.type === 'scm-states') {
-            args = { ...args };
-            args.uris = context.scmResourceStates.map(s => s.resourceUri);
-            return this.execute(args);
-        }
-
-        if (context.type === 'scm-groups') {
-            args = { ...args };
-            args.uris = context.scmResourceGroups.reduce<Uri[]>((a, b) => a.concat(b.resourceStates.map(s => s.resourceUri)), []);
-            return this.execute(args);
-        }
-
-        return this.execute(args);
-    }
-
-    async execute(args: StashSaveCommandArgs = {}) {
+    async execute(args: StashSaveCommandArgs = { unstagedOnly: false }) {
        if (!this.git.repoPath) return undefined;

+        args = { ...args };
+        if (args.unstagedOnly === undefined) {
+            args.unstagedOnly = false;
+        }
+
        try {
            if (args.message == null) {
-                args = { ...args };
                args.message = await window.showInputBox({
                    prompt: `Please provide a stash message`,
                    placeHolder: `Stash message`
@@ -48,7 +35,7 @@ export class StashSaveCommand extends Command {
                if (args.message === undefined) return args.goBackCommand === undefined ? undefined : args.goBackCommand.execute();
            }

-            return await this.git.stashSave(this.git.repoPath, args.message, args.uris);
+            return await this.git.stashSave(this.git.repoPath, args.message, args.unstagedOnly);
        }
        catch (ex) {
            Logger.error(ex, 'StashSaveCommand');
--- a/src/configuration.ts
+++ b/src/configuration.ts
@@ -7,8 +7,7 @@ import { OutputLevel } from './logger';

 export { ExtensionKey } from './constants';

-export type CodeLensCommand =
-    'gitlens.toggleFileBlame' |
+export type CodeLensCommand = 'gitlens.toggleFileBlame' |
    'gitlens.showBlameHistory' |
    'gitlens.showFileHistory' |
    'gitlens.diffWithPrevious' |
@@ -42,18 +41,7 @@ export const LineHighlightLocations = {
    OverviewRuler: 'overviewRuler' as LineHighlightLocations
 };

-export type CustomRemoteType =
-    'Bitbucket' |
-    'GitHub' |
-    'GitLab';
-export const CustomRemoteType = {
-    Bitbucket: 'Bitbucket' as CustomRemoteType,
-    GitHub: 'GitHub' as CustomRemoteType,
-    GitLab: 'GitLab' as CustomRemoteType
-};
-
-export type StatusBarCommand =
-    'gitlens.toggleFileBlame' |
+export type StatusBarCommand = 'gitlens.toggleFileBlame' |
    'gitlens.showBlameHistory' |
    'gitlens.showFileHistory' |
    'gitlens.toggleCodeLens' |
@@ -131,11 +119,6 @@ export interface ICodeLensLanguageLocation {
    customSymbols?: string[];
 }

-export interface IRemotesConfig {
-    type: CustomRemoteType;
-    domain: string;
-}
-
 export interface IThemeConfig {
    annotations: {
        file: {
@@ -316,7 +299,6 @@ export interface IConfig {

    gitExplorer: {
        view: GitExplorerView;
-        showTrackingBranch: boolean;
        commitFormat: string;
        commitFileFormat: string;
        stashFormat: string;
@@ -324,8 +306,6 @@ export interface IConfig {
        // dateFormat: string | null;
    };

-    remotes: IRemotesConfig[];
-
    statusBar: {
        enabled: boolean;
        alignment: 'left' | 'right';
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -8,6 +8,8 @@ export const QualifiedExtensionId = `eamodio.${ExtensionId}`;

 export const ApplicationInsightsKey = 'a9c302f8-6483-4d01-b92c-c159c799c679';

+export const FakeSha = 'ffffffffffffffffffffffffffffffffffffffff';
+
 export type BuiltInCommands = 'cursorMove' |
    'editor.action.showReferences' |
    'editor.action.toggleRenderWhitespace' |
--- a/src/currentLineController.ts
+++ b/src/currentLineController.ts
@@ -7,7 +7,7 @@ import { Commands } from './commands';
 import { TextEditorComparer } from './comparers';
 import { IConfig, StatusBarCommand } from './configuration';
 import { DocumentSchemes, ExtensionKey } from './constants';
-import { BlameabilityChangeEvent, CommitFormatter, GitCommit, GitCommitLine, GitContextTracker, GitService, GitUri, ICommitFormatOptions } from './gitService';
+import { BlameabilityChangeEvent, CommitFormatter, GitCommit, GitCommitLine, GitContextTracker, GitService, GitUri } from './gitService';
 import { Logger } from './logger';

 const annotationDecoration: TextEditorDecorationType = window.createTextEditorDecorationType({
@@ -462,10 +462,7 @@ export class CurrentLineController extends Disposable {
        const cfg = this._config.statusBar;
        if (!cfg.enabled || this._statusBarItem === undefined) return;

-        this._statusBarItem.text = `$(git-commit) ${CommitFormatter.fromTemplate(cfg.format, commit, {
-            truncateMessageAtNewLine: true,
-            dateFormat: cfg.dateFormat === null ? this._config.defaultDateFormat : cfg.dateFormat
-        } as ICommitFormatOptions)}`;
+        this._statusBarItem.text = `$(git-commit) ${CommitFormatter.fromTemplate(cfg.format, commit, cfg.dateFormat === null ? this._config.defaultDateFormat : cfg.dateFormat)}`;

        switch (cfg.command) {
            case StatusBarCommand.BlameAnnotate:
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -3,9 +3,9 @@
 import { commands, ExtensionContext, extensions, languages, window, workspace } from 'vscode';
 import { AnnotationController } from './annotations/annotationController';
 import { CloseUnchangedFilesCommand, OpenChangedFilesCommand } from './commands';
-import { OpenBranchesInRemoteCommand, OpenBranchInRemoteCommand, OpenCommitInRemoteCommand, OpenFileInRemoteCommand, OpenInRemoteCommand, OpenRepoInRemoteCommand } from './commands';
+import { OpenBranchInRemoteCommand, OpenCommitInRemoteCommand, OpenFileInRemoteCommand, OpenInRemoteCommand, OpenRepoInRemoteCommand } from './commands';
 import { CopyMessageToClipboardCommand, CopyShaToClipboardCommand } from './commands';
-import { DiffDirectoryCommand, DiffLineWithPreviousCommand, DiffLineWithWorkingCommand, DiffWithBranchCommand, DiffWithCommand, DiffWithNextCommand, DiffWithPreviousCommand, DiffWithRevisionCommand, DiffWithWorkingCommand } from './commands';
+import { DiffDirectoryCommand, DiffLineWithPreviousCommand, DiffLineWithWorkingCommand, DiffWithBranchCommand, DiffWithNextCommand, DiffWithPreviousCommand, DiffWithRevisionCommand, DiffWithWorkingCommand } from './commands';
 import { ResetSuppressedWarningsCommand } from './commands';
 import { ClearFileAnnotationsCommand, ShowFileBlameCommand, ShowLineBlameCommand, ToggleFileBlameCommand, ToggleFileRecentChangesCommand, ToggleLineBlameCommand } from './commands';
 import { ShowBlameHistoryCommand, ShowFileHistoryCommand } from './commands';
@@ -19,7 +19,6 @@ import { CodeLensLocations, IConfig, LineHighlightLocations } from './configurat
 import { ApplicationInsightsKey, CommandContext, ExtensionKey, QualifiedExtensionId, setCommandContext, WorkspaceState } from './constants';
 import { CodeLensController } from './codeLensController';
 import { CurrentLineController, LineAnnotationType } from './currentLineController';
-import { RemoteProviderFactory } from './git/remotes/factory';
 import { GitContentProvider } from './gitContentProvider';
 import { GitExplorer } from './views/gitExplorer';
 import { GitRevisionCodeLensProvider } from './gitRevisionCodeLensProvider';
@@ -34,7 +33,6 @@ export async function activate(context: ExtensionContext) {
    Logger.configure(context);
    Messages.configure(context);
    Telemetry.configure(ApplicationInsightsKey);
-    RemoteProviderFactory.configure(context);

    const gitlens = extensions.getExtension(QualifiedExtensionId)!;
    const gitlensVersion = gitlens.packageJSON.version;
@@ -105,13 +103,11 @@ export async function activate(context: ExtensionContext) {
    context.subscriptions.push(new DiffDirectoryCommand(git));
    context.subscriptions.push(new DiffLineWithPreviousCommand(git));
    context.subscriptions.push(new DiffLineWithWorkingCommand(git));
-    context.subscriptions.push(new DiffWithCommand(git));
    context.subscriptions.push(new DiffWithBranchCommand(git));
    context.subscriptions.push(new DiffWithNextCommand(git));
    context.subscriptions.push(new DiffWithPreviousCommand(git));
    context.subscriptions.push(new DiffWithRevisionCommand(git));
    context.subscriptions.push(new DiffWithWorkingCommand(git));
-    context.subscriptions.push(new OpenBranchesInRemoteCommand(git));
    context.subscriptions.push(new OpenBranchInRemoteCommand(git));
    context.subscriptions.push(new OpenCommitInRemoteCommand(git));
    context.subscriptions.push(new OpenFileInRemoteCommand(git));
--- a/src/git/formatters/commit.ts
+++ b/src/git/formatters/commit.ts
@@ -3,11 +3,8 @@ 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 {
-    truncateMessageAtNewLine?: boolean;
-
    tokenOptions?: {
        ago?: Strings.ITokenOptions;
        author?: Strings.ITokenOptions;
@@ -44,14 +41,7 @@ export class CommitFormatter extends Formatter<GitCommit, ICommitFormatOptions>
    }

    get message() {
-        let message = this._item.isUncommitted ? 'Uncommitted change' : this._item.message;
-        if (this._options.truncateMessageAtNewLine) {
-            const index = message.indexOf('\n');
-            if (index !== -1) {
-                message = `${message.substring(0, index)}${GlyphChars.Space}${GlyphChars.Ellipsis}`;
-            }
-        }
-
+        const message = this._item.isUncommitted ? 'Uncommitted change' : this._item.message;
        return this._padOrTruncate(message, this._options.tokenOptions!.message);
    }

--- a/src/git/git.ts
+++ b/src/git/git.ts
@@ -1,5 +1,4 @@
 'use strict';
-import { Strings } from '../system';
 import { findGitPath, IGit } from './gitLocator';
 import { Logger } from '../logger';
 import { spawnPromise } from 'spawn-rx';
@@ -11,7 +10,6 @@ import * as iconv from 'iconv-lite';
 export { IGit };
 export * from './models/models';
 export * from './parsers/blameParser';
-export * from './parsers/branchParser';
 export * from './parsers/diffParser';
 export * from './parsers/logParser';
 export * from './parsers/stashParser';
@@ -35,53 +33,36 @@ const GitWarnings = [
    /no such path/,
    /does not have any commits/,
    /Path \'.*?\' does not exist in/,
-    /Path \'.*?\' exists on disk, but not in/,
-    /no upstream configured for branch/
+    /Path \'.*?\' exists on disk, but not in/
 ];

-interface GitCommandOptions {
-    cwd: string;
-    encoding?: string;
-    overrideErrorHandling?: boolean;
-}
-
-async function gitCommand(options: GitCommandOptions, ...args: any[]): Promise<string> {
-    if (options.overrideErrorHandling) return gitCommandCore(options, ...args);
-
+async function gitCommand(options: { cwd: string, encoding?: string }, ...args: any[]) {
    try {
-        return await gitCommandCore(options, ...args);
+        // Fixes https://github.com/eamodio/vscode-gitlens/issues/73
+        // See https://stackoverflow.com/questions/4144417/how-to-handle-asian-characters-in-file-names-in-git-on-os-x
+        args.splice(0, 0, '-c', 'core.quotepath=false');
+
+        const opts = { encoding: 'utf8', ...options };
+        const s = await spawnPromise(git.path, args, { cwd: options.cwd, encoding: (opts.encoding === 'utf8') ? 'utf8' : 'binary' });
+        Logger.log('git', ...args, `  cwd='${options.cwd}'`);
+        if (opts.encoding === 'utf8' || opts.encoding === 'binary') return s;
+
+        return iconv.decode(Buffer.from(s, 'binary'), opts.encoding);
    }
    catch (ex) {
-        return gitCommandDefaultErrorHandler(ex, options, ...args);
-    }
-}
-
-async function gitCommandCore(options: GitCommandOptions, ...args: any[]): Promise<string> {
-    // Fixes https://github.com/eamodio/vscode-gitlens/issues/73
-    // See https://stackoverflow.com/questions/4144417/how-to-handle-asian-characters-in-file-names-in-git-on-os-x
-    args.splice(0, 0, '-c', 'core.quotepath=false');
-
-    const opts = { encoding: 'utf8', ...options };
-    const s = await spawnPromise(git.path, args, { cwd: options.cwd, encoding: (opts.encoding === 'utf8') ? 'utf8' : 'binary' });
-    Logger.log('git', ...args, `  cwd='${options.cwd}'`);
-    if (opts.encoding === 'utf8' || opts.encoding === 'binary') return s;
-
-    return iconv.decode(Buffer.from(s, 'binary'), opts.encoding);
-}
-
-function gitCommandDefaultErrorHandler(ex: Error, options: GitCommandOptions, ...args: any[]): string {
-    const msg = ex && ex.toString();
-    if (msg) {
-        for (const warning of GitWarnings) {
-            if (warning.test(msg)) {
-                Logger.warn('git', ...args, `  cwd='${options.cwd}'`, msg && `\n  ${msg.replace(/\r?\n|\r/g, ' ')}`);
-                return '';
+        const msg = ex && ex.toString();
+        if (msg) {
+            for (const warning of GitWarnings) {
+                if (warning.test(msg)) {
+                    Logger.warn('git', ...args, `  cwd='${options.cwd}'`, msg && `\n  ${msg.replace(/\r?\n|\r/g, ' ')}`);
+                    return '';
+                }
            }
        }
-    }

-    Logger.error(ex, 'git', ...args, `  cwd='${options.cwd}'`, msg && `\n  ${msg.replace(/\r?\n|\r/g, ' ')}`);
-    throw ex;
+        Logger.error(ex, 'git', ...args, `  cwd='${options.cwd}'`, msg && `\n  ${msg.replace(/\r?\n|\r/g, ' ')}`);
+        throw ex;
+    }
 }

 export class Git {
@@ -110,9 +91,8 @@ export class Git {

    static async getVersionedFile(repoPath: string | undefined, fileName: string, branchOrSha: string) {
        const data = await Git.show(repoPath, fileName, branchOrSha, 'binary');
-        if (data === undefined) return undefined;

-        const suffix = Strings.truncate(Strings.sanitizeForFS(Git.isSha(branchOrSha) ? Git.shortenSha(branchOrSha) : branchOrSha), 50, '');
+        const suffix = Git.isSha(branchOrSha) ? branchOrSha.substring(0, 8) : branchOrSha;
        const ext = path.extname(fileName);
        return new Promise<string>((resolve, reject) => {
            tmp.file({ prefix: `${path.basename(fileName, ext)}-${suffix}__`, postfix: ext },
@@ -147,10 +127,6 @@ export class Git {
        return fileName && fileName.replace(/\\/g, '/');
    }

-    static shortenSha(sha: string) {
-        return sha.substring(0, 8);
-    }
-
    static splitPath(fileName: string, repoPath: string | undefined, extract: boolean = true): [string, string] {
        if (repoPath) {
            fileName = this.normalizePath(fileName);
@@ -192,42 +168,20 @@ export class Git {
        return gitCommand({ cwd: root }, ...params, `--`, file);
    }

-    static branch(repoPath: string, options: { all: boolean } = { all: false }) {
-        const params = [`branch`, `-vv`];
-        if (options.all) {
+    static branch(repoPath: string, all: boolean) {
+        const params = [`branch`];
+        if (all) {
            params.push(`-a`);
        }

        return gitCommand({ cwd: repoPath }, ...params);
    }

-    static async branch_current(repoPath: string) {
-        const params = [`rev-parse`, `--abbrev-ref`, `--symbolic-full-name`, `@`, `@{u}`];
-
-        const opts = { cwd: repoPath, overrideErrorHandling: true };
-        try {
-            return await gitCommand(opts, ...params);
-        }
-        catch (ex) {
-            if (/no upstream configured for branch/.test(ex && ex.toString())) {
-                return ex.message.split('\n')[0];
-            }
-
-            return gitCommandDefaultErrorHandler(ex, opts, ...params);
-        }
-    }
-
-    static checkout(repoPath: string, fileName: string, sha: string) {
-        const [file, root] = Git.splitPath(fileName, repoPath);
-
-        return gitCommand({ cwd: root }, `checkout`, sha, `--`, file);
-    }
-
    static async config_get(key: string, repoPath?: string) {
        try {
-            return await gitCommand({ cwd: repoPath || '', overrideErrorHandling: true }, `config`, `--get`, key);
+            return await gitCommand({ cwd: repoPath || '' }, `config`, `--get`, key);
        }
-        catch {
+        catch (ex) {
            return '';
        }
    }
@@ -331,9 +285,9 @@ export class Git {

    static async ls_files(repoPath: string, fileName: string): Promise<string> {
        try {
-            return await gitCommand({ cwd: repoPath, overrideErrorHandling: true }, 'ls-files', fileName);
+            return await gitCommand({ cwd: repoPath }, 'ls-files', fileName);
        }
-        catch {
+        catch (ex) {
            return '';
        }
    }
@@ -346,24 +300,12 @@ export class Git {
        return gitCommand({ cwd: repoPath }, 'remote', 'get-url', remote);
    }

-    static async show(repoPath: string | undefined, fileName: string, branchOrSha: string, encoding?: string) {
+    static show(repoPath: string | undefined, fileName: string, branchOrSha: string, encoding?: string) {
        const [file, root] = Git.splitPath(fileName, repoPath);
        branchOrSha = branchOrSha.replace('^', '');

-        if (Git.isUncommitted(branchOrSha)) throw new Error(`sha=${branchOrSha} is uncommitted`);
-
-        const opts = { cwd: root, encoding: encoding || defaultEncoding, overrideErrorHandling: true };
-        const args = `${branchOrSha}:./${file}`;
-        try {
-            return await gitCommand(opts, 'show', args);
-        }
-        catch (ex) {
-            if (/Path \'.*?\' does not exist in/.test(ex && ex.toString())) {
-                return undefined;
-            }
-
-            return gitCommandDefaultErrorHandler(ex, opts, args);
-        }
+        if (Git.isUncommitted(branchOrSha)) return Promise.reject(new Error(`sha=${branchOrSha} is uncommitted`));
+        return gitCommand({ cwd: root, encoding: encoding || defaultEncoding }, 'show', `${branchOrSha}:./${file}`);
    }

    static stash_apply(repoPath: string, stashName: string, deleteAfter: boolean) {
@@ -380,18 +322,11 @@ export class Git {
        return gitCommand({ cwd: repoPath }, ...defaultStashParams);
    }

-    static stash_push(repoPath: string, pathspecs: string[], message?: string) {
-        const params = [`stash`, `push`, `-u`];
-        if (message) {
-            params.push(`-m`);
-            params.push(message);
+    static stash_save(repoPath: string, message?: string, unstagedOnly: boolean = false) {
+        const params = [`stash`, `save`, `--include-untracked`];
+        if (unstagedOnly) {
+            params.push(`--keep-index`);
        }
-        params.splice(params.length, 0, `--`, ...pathspecs);
-        return gitCommand({ cwd: repoPath }, ...params);
-    }
-
-    static stash_save(repoPath: string, message?: string) {
-        const params = [`stash`, `save`, `-u`];
        if (message) {
            params.push(message);
        }
--- a/src/git/gitUri.ts
+++ b/src/git/gitUri.ts
@@ -56,7 +56,7 @@ export class GitUri extends Uri {
    }

    get shortSha() {
-        return this.sha && GitService.shortenSha(this.sha);
+        return this.sha && this.sha.substring(0, 8);
    }

    fileUri() {
--- a/src/git/models/branch.ts
+++ b/src/git/models/branch.ts
@@ -5,32 +5,25 @@ export class GitBranch {
    current: boolean;
    name: string;
    remote: boolean;
-    tracking?: string;

-    constructor(public readonly repoPath: string, branch: string, current: boolean = false, tracking?: string) {
+    constructor(branch: string) {
+        branch = branch.trim();
+
+        if (branch.startsWith('* ')) {
+            branch = branch.substring(2);
+            this.current = true;
+        }
+
        if (branch.startsWith('remotes/')) {
            branch = branch.substring(8);
            this.remote = true;
        }

-        this.current = current;
+        const index = branch.indexOf(' ');
+        if (index !== -1) {
+            branch = branch.substring(0, index);
+        }
+
        this.name = branch;
-        this.tracking = tracking;
-    }
-
-    getName(): string {
-        return this.remote
-            ? this.name.substring(this.name.indexOf('/') + 1)
-            : this.name;
-    }
-
-    getRemote(): string | undefined {
-        if (this.remote) return GitBranch.getRemote(this.name);
-        if (this.tracking !== undefined) return GitBranch.getRemote(this.tracking);
-        return undefined;
-    }
-
-    static getRemote(branch: string): string {
-        return branch.substring(0, branch.indexOf('/'));
    }
 }
--- a/src/git/models/commit.ts
+++ b/src/git/models/commit.ts
@@ -51,7 +51,7 @@ export class GitCommit {
    }

    get shortSha() {
-        return Git.shortenSha(this.sha);
+        return this.sha.substring(0, 8);
    }

    get isUncommitted(): boolean {
@@ -62,7 +62,7 @@ export class GitCommit {
    }

    get previousShortSha() {
-        return this.previousSha && Git.shortenSha(this.previousSha);
+        return this.previousSha && this.previousSha.substring(0, 8);
    }

    get previousUri(): Uri {
--- a/src/git/models/logCommit.ts
+++ b/src/git/models/logCommit.ts
@@ -1,7 +1,6 @@
 'use strict';
 import { Uri } from 'vscode';
 import { GitCommit, GitCommitType } from './commit';
-import { Git } from '../git';
 import { GitStatusFileStatus, IGitStatusFile } from './status';
 import * as path from 'path';

@@ -50,7 +49,7 @@ export class GitLogCommit extends GitCommit {
    }

    get nextShortSha() {
-        return this.nextSha && Git.shortenSha(this.nextSha);
+        return this.nextSha && this.nextSha.substring(0, 8);
    }

    get nextUri(): Uri {
--- a/src/git/parsers/branchParser.ts
+++ b/src/git/parsers/branchParser.ts
@@ -1,24 +0,0 @@
-'use strict';
-import { GitBranch } from './../git';
-const branchWithTrackingRegex = /^(\*?)\s+(.+?)\s+([0-9,a-f]+)\s+(?:\[(.*?\/.*?)(?:\:|\]))?/gm;
-
-export class GitBranchParser {
-
-    static parse(data: string, repoPath: string): GitBranch[] | undefined {
-        if (!data) return undefined;
-
-        const branches: GitBranch[] = [];
-
-        let match: RegExpExecArray | null = null;
-        do {
-            match = branchWithTrackingRegex.exec(data);
-            if (match == null) break;
-
-            branches.push(new GitBranch(repoPath, match[2], match[1] === '*', match[4]));
-        } while (match != null);
-
-        if (!branches.length) return undefined;
-
-        return branches;
-    }
-}
--- a/src/git/remotes/bitbucket.ts
+++ b/src/git/remotes/bitbucket.ts
@@ -12,10 +12,6 @@ export class BitbucketService extends RemoteProvider {
        return 'Bitbucket';
    }

-    protected getUrlForBranches(): string {
-        return `${this.baseUrl}/branches`;
-    }
-
    protected getUrlForBranch(branch: string): string {
        return `${this.baseUrl}/commits/branch/${branch}`;
    }
--- a/src/git/remotes/factory.ts
+++ b/src/git/remotes/factory.ts
@@ -1,64 +1,24 @@
 'use strict';
-import { ExtensionContext, workspace } from 'vscode';
+import { RemoteProvider } from './provider';
 import { BitbucketService } from './bitbucket';
-import { CustomRemoteType, IConfig, IRemotesConfig } from '../../configuration';
-import { ExtensionKey } from '../../constants';
 import { GitHubService } from './github';
 import { GitLabService } from './gitlab';
-import { Logger } from '../../logger';
-import { RemoteProvider } from './provider';
 import { VisualStudioService } from './visualStudio';
-import { Objects } from '../../system';
+import { Logger } from '../../logger';

 export { RemoteProvider };

-const UrlRegex = /^(?:git:\/\/(.*?)\/|https:\/\/(.*?)\/|http:\/\/(.*?)\/|git@(.*):|ssh:\/\/(?:.*@)?(.*?)(?::.*?)?\/)(.*)$/;
-
-function getProviderKey(type: CustomRemoteType) {
-    switch (type) {
-        case CustomRemoteType.Bitbucket: return 'bitbucket.org';
-        case CustomRemoteType.GitHub: return 'github.com';
-        case CustomRemoteType.GitLab: return 'gitlab.com';
-    }
-    return undefined;
-}
-
-const defaultProviderMap = new Map<string, (domain: string, path: string) => RemoteProvider>([
+const providerMap = new Map<string, (domain: string, path: string) => RemoteProvider>([
    ['bitbucket.org', (domain: string, path: string) => new BitbucketService(domain, path)],
    ['github.com', (domain: string, path: string) => new GitHubService(domain, path)],
    ['gitlab.com', (domain: string, path: string) => new GitLabService(domain, path)],
    ['visualstudio.com', (domain: string, path: string) => new VisualStudioService(domain, path)]
 ]);

-let providerMap: Map<string, (domain: string, path: string) => RemoteProvider>;
-let remotesCfg: IRemotesConfig[];
-
-function onConfigurationChanged() {
-    const cfg = workspace.getConfiguration().get<IConfig>(ExtensionKey);
-    if (cfg === undefined) return;
-
-    if (!Objects.areEquivalent(cfg.remotes, remotesCfg)) {
-        providerMap = new Map(defaultProviderMap);
-
-        remotesCfg = cfg.remotes;
-        if (remotesCfg != null && remotesCfg.length > 0) {
-            for (const svc of remotesCfg) {
-                const key = getProviderKey(svc.type);
-                if (key === undefined) continue;
-
-                providerMap.set(svc.domain.toLowerCase(), providerMap.get(key)!);
-            }
-        }
-    }
-}
+const UrlRegex = /^(?:git:\/\/(.*?)\/|https:\/\/(.*?)\/|http:\/\/(.*?)\/|git@(.*):|ssh:\/\/(?:.*@)?(.*?)(?::.*?)?\/)(.*)$/;

 export class RemoteProviderFactory {

-    static configure(context: ExtensionContext) {
-        context.subscriptions.push(workspace.onDidChangeConfiguration(onConfigurationChanged));
-        onConfigurationChanged();
-    }
-
    static getRemoteProvider(url: string): RemoteProvider | undefined {
        try {
            const match = UrlRegex.exec(url);
@@ -72,7 +32,7 @@ export class RemoteProviderFactory {
                : domain;

            const creator = providerMap.get(key.toLowerCase());
-            if (creator === undefined) return undefined;
+            if (!creator) return undefined;

            return creator(domain, path);
        }
--- a/src/git/remotes/github.ts
+++ b/src/git/remotes/github.ts
@@ -12,10 +12,6 @@ export class GitHubService extends RemoteProvider {
        return 'GitHub';
    }

-    protected getUrlForBranches(): string {
-        return `${this.baseUrl}/branches`;
-    }
-
    protected getUrlForBranch(branch: string): string {
        return `${this.baseUrl}/commits/${branch}`;
    }
--- a/src/git/remotes/provider.ts
+++ b/src/git/remotes/provider.ts
@@ -3,10 +3,9 @@ import { commands, Range, Uri } from 'vscode';
 import { BuiltInCommands } from '../../constants';
 import { GitLogCommit } from '../../gitService';

-export type RemoteResourceType = 'branch' | 'branches' | 'commit' | 'file' | 'repo' | 'revision';
+export type RemoteResourceType = 'branch' | 'commit' | 'file' | 'repo' | 'revision';
 export type RemoteResource =
    { type: 'branch', branch: string } |
-    { type: 'branches' } |
    { type: 'commit', sha: string } |
    { type: 'file', branch?: string, fileName: string, range?: Range } |
    { type: 'repo' } |
@@ -15,7 +14,6 @@ export type RemoteResource =
 export function getNameFromRemoteResource(resource: RemoteResource) {
    switch (resource.type) {
        case 'branch': return 'Branch';
-        case 'branches': return 'Branches';
        case 'commit': return 'Commit';
        case 'file': return 'File';
        case 'repo': return 'Repository';
@@ -34,7 +32,6 @@ export abstract class RemoteProvider {
        return `https://${this.domain}/${this.path}`;
    }

-    protected abstract getUrlForBranches(): string;
    protected abstract getUrlForBranch(branch: string): string;
    protected abstract getUrlForCommit(sha: string): string;
    protected abstract getUrlForFile(fileName: string, branch?: string, sha?: string, range?: Range): string;
@@ -48,7 +45,6 @@ export abstract class RemoteProvider {
    open(resource: RemoteResource): Promise<{} | undefined> {
        switch (resource.type) {
            case 'branch': return this.openBranch(resource.branch);
-            case 'branches': return this.openBranches();
            case 'commit': return this.openCommit(resource.sha);
            case 'file': return this.openFile(resource.fileName, resource.branch, undefined, resource.range);
            case 'repo': return this.openRepo();
@@ -60,10 +56,6 @@ export abstract class RemoteProvider {
        return this._openUrl(this.baseUrl);
    }

-    openBranches() {
-        return this._openUrl(this.getUrlForBranches());
-    }
-
    openBranch(branch: string) {
        return this._openUrl(this.getUrlForBranch(branch));
    }
--- a/src/git/remotes/visualStudio.ts
+++ b/src/git/remotes/visualStudio.ts
@@ -12,10 +12,6 @@ export class VisualStudioService extends RemoteProvider {
        return 'Visual Studio Team Services';
    }

-    protected getUrlForBranches(): string {
-        return `${this.baseUrl}/branches`;
-    }
-
    protected getUrlForBranch(branch: string): string {
        return `${this.baseUrl}/?version=GB${branch}&_a=history`;
    }
--- a/src/gitContentProvider.ts
+++ b/src/gitContentProvider.ts
@@ -15,9 +15,7 @@ export class GitContentProvider implements TextDocumentContentProvider {
        const data = GitService.fromGitContentUri(uri);
        const fileName = data.originalFileName || data.fileName;
        try {
-            let text = data.sha !== GitService.fakeSha
-                ? await this.git.getVersionedFileText(data.repoPath, fileName, data.sha)
-                : '';
+            let text = await this.git.getVersionedFileText(data.repoPath, fileName, data.sha);
            if (data.decoration) {
                text = `${data.decoration}\n${text}`;
            }
@@ -25,7 +23,7 @@ export class GitContentProvider implements TextDocumentContentProvider {
        }
        catch (ex) {
            Logger.error(ex, 'GitContentProvider', 'getVersionedFileText');
-            window.showErrorMessage(`Unable to show Git revision ${GitService.shortenSha(data.sha)} of '${path.relative(data.repoPath, fileName)}'`);
+            window.showErrorMessage(`Unable to show Git revision ${data.sha.substring(0, 8)} of '${path.relative(data.repoPath, fileName)}'`);
            return undefined;
        }
    }
--- a/src/gitService.ts
+++ b/src/gitService.ts
--- a/src/messages.ts
+++ b/src/messages.ts
@@ -11,8 +11,7 @@ export type SuppressedKeys = 'suppressCommitHasNoPreviousCommitWarning' |
    'suppressGitVersionWarning' |
    'suppressLineUncommittedWarning' |
    'suppressNoRepositoryWarning' |
-    'suppressUpdateNotice' |
-    'suppressWelcomeNotice';
+    'suppressUpdateNotice';
 export const SuppressedKeys = {
    CommitHasNoPreviousCommitWarning: 'suppressCommitHasNoPreviousCommitWarning' as SuppressedKeys,
    CommitNotFoundWarning: 'suppressCommitNotFoundWarning' as SuppressedKeys,
@@ -20,8 +19,7 @@ export const SuppressedKeys = {
    GitVersionWarning: 'suppressGitVersionWarning' as SuppressedKeys,
    LineUncommittedWarning: 'suppressLineUncommittedWarning' as SuppressedKeys,
    NoRepositoryWarning: 'suppressNoRepositoryWarning' as SuppressedKeys,
-    UpdateNotice: 'suppressUpdateNotice' as SuppressedKeys,
-    WelcomeNotice: 'suppressWelcomeNotice' as SuppressedKeys
+    UpdateNotice: 'suppressUpdateNotice' as SuppressedKeys
 };

 export class Messages {
@@ -32,8 +30,7 @@ export class Messages {
        this.context = context;
    }

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

@@ -68,7 +65,7 @@ export class Messages {

    static async showWelcomeMessage(): Promise<string | undefined> {
        const viewDocs = 'View Docs';
-        const result = await Messages._showMessage('info', `Thank you for choosing GitLens! GitLens is powerful, feature rich, and highly configurable, so please be sure to view the docs and tailor it to suit your needs.`, SuppressedKeys.WelcomeNotice, null, viewDocs);
+        const result = await window.showInformationMessage(`Thank you for choosing GitLens! GitLens is powerful, feature rich, and highly configurable, so please be sure to view the docs and tailor it to suit your needs.`, viewDocs);
        if (result === viewDocs) {
            commands.executeCommand(BuiltInCommands.Open, Uri.parse('https://marketplace.visualstudio.com/items/eamodio.gitlens'));
        }
@@ -76,7 +73,7 @@ export class Messages {
    }

    private static async _showMessage(type: 'info' | 'warn' | 'error', message: string, suppressionKey: SuppressedKeys, dontShowAgain: string | null = 'Don\'t Show Again', ...actions: any[]): Promise<string | undefined> {
-        Logger.log(`ShowMessage(${type}, '${message}', ${suppressionKey}, ${dontShowAgain})`);
+        Logger.log(`ShowMessage(${type}, "${message}", ${suppressionKey}, ${dontShowAgain})`);

        if (Messages.context.globalState.get(suppressionKey, false)) {
            Logger.log(`ShowMessage(${type}, ${message}, ${suppressionKey}, ${dontShowAgain}) skipped`);
@@ -103,13 +100,12 @@ export class Messages {
        }

        if (dontShowAgain === null || result === dontShowAgain) {
-            Logger.log(`ShowMessage(${type}, '${message}', ${suppressionKey}, ${dontShowAgain}) don't show again requested`);
+            Logger.log(`ShowMessage(${type}, ${message}, ${suppressionKey}, ${dontShowAgain}) don't show again requested`);
            await Messages.context.globalState.update(suppressionKey, true);
-
-            if (result === dontShowAgain) return undefined;
+            return undefined;
        }

-        Logger.log(`ShowMessage(${type}, '${message}', ${suppressionKey}, ${dontShowAgain}) returned ${result}`);
+        Logger.log(`ShowMessage(${type}, ${message}, ${suppressionKey}, ${dontShowAgain}) returned ${result}`);
        return result;
    }
 }
--- a/src/quickPicks/commitDetails.ts
+++ b/src/quickPicks/commitDetails.ts
@@ -24,14 +24,17 @@ export class CommitWithFileStatusQuickPickItem extends OpenFileCommandQuickPickI
        const description = GitStatusFile.getFormattedDirectory(status, true);

        let sha;
+        let shortSha;
        if (status.status === 'D') {
            sha = commit.previousSha!;
+            shortSha = commit.previousShortSha!;
        }
        else {
            sha = commit.sha;
+            shortSha = commit.shortSha;
        }

-        super(GitService.toGitContentUri(sha, status.fileName, commit.repoPath, status.originalFileName), {
+        super(GitService.toGitContentUri(sha, shortSha, status.fileName, commit.repoPath, status.originalFileName), {
            label: `${Strings.pad(octicon, 4, 2)} ${path.basename(status.fileName)}`,
            description: description
        });
@@ -45,7 +48,7 @@ export class CommitWithFileStatusQuickPickItem extends OpenFileCommandQuickPickI
            originalFileName: status.originalFileName
        } as IGitCommitInfo);
        this.sha = sha;
-        this.shortSha = GitService.shortenSha(sha)!;
+        this.shortSha = shortSha;
        this.status = status.status;
    }

@@ -85,7 +88,7 @@ export class OpenCommitFileRevisionsCommandQuickPickItem extends OpenFilesComman
    constructor(commit: GitLogCommit, item?: QuickPickItem) {
        const uris = commit.fileStatuses
            .filter(s => s.status !== 'D')
-            .map(s => GitService.toGitContentUri(commit.sha, s.fileName, commit.repoPath, s.originalFileName));
+            .map(s => GitService.toGitContentUri(commit.sha, commit.shortSha, s.fileName, commit.repoPath, s.originalFileName));

        super(uris, item || {
            label: `$(file-symlink-file) Open Changed Revisions`,
--- a/src/quickPicks/commitFileDetails.ts
+++ b/src/quickPicks/commitFileDetails.ts
@@ -4,7 +4,7 @@ import { QuickPickItem, QuickPickOptions, Uri, window } from 'vscode';
 import { Commands, CopyMessageToClipboardCommandArgs, CopyShaToClipboardCommandArgs, DiffWithPreviousCommandArgs, DiffWithWorkingCommandArgs, ShowQuickCommitDetailsCommandArgs, ShowQuickCommitFileDetailsCommandArgs, ShowQuickFileHistoryCommandArgs } from '../commands';
 import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, KeyCommandQuickPickItem, OpenFileCommandQuickPickItem } from './common';
 import { GlyphChars } from '../constants';
-import { GitLog, GitLogCommit, GitService, GitUri, RemoteResource } from '../gitService';
+import { GitBranch, GitLog, GitLogCommit, GitService, GitUri, RemoteResource } from '../gitService';
 import { Keyboard, KeyCommand, KeyNoopCommand } from '../keyboard';
 import { OpenRemotesCommandQuickPickItem } from './remotes';
 import * as moment from 'moment';
@@ -27,7 +27,7 @@ export class OpenCommitFileRevisionCommandQuickPickItem extends OpenFileCommandQ
        let description: string;
        let uri: Uri;
        if (commit.status === 'D') {
-            uri = GitService.toGitContentUri(commit.previousSha!, commit.previousFileName!, commit.repoPath, undefined);
+            uri = GitService.toGitContentUri(commit.previousSha!, commit.previousShortSha!, commit.previousFileName!, commit.repoPath, undefined);
            description = `${Strings.pad(GlyphChars.Dash, 2, 3)} ${path.basename(commit.fileName)} in ${GlyphChars.Space}$(git-commit) ${commit.previousShortSha} (deleted in ${GlyphChars.Space}$(git-commit) ${commit.shortSha})`;
        }
        else {
@@ -128,11 +128,11 @@ export class CommitFileDetailsQuickPick {
        const remotes = Arrays.uniqueBy(await git.getRemotes(commit.repoPath), _ => _.url, _ => !!_.provider);
        if (remotes.length) {
            if (commit.workingFileName && commit.status !== 'D') {
-                const branch = await git.getBranch(commit.repoPath || git.repoPath);
+                const branch = await git.getBranch(commit.repoPath || git.repoPath) as GitBranch;
                items.push(new OpenRemotesCommandQuickPickItem(remotes, {
                    type: 'file',
                    fileName: commit.workingFileName,
-                    branch: branch!.name
+                    branch: branch.name
                } as RemoteResource, currentCommand));
            }
            if (!stash) {
--- a/src/quickPicks/remotes.ts
+++ b/src/quickPicks/remotes.ts
@@ -4,7 +4,7 @@ import { QuickPickOptions, window } from 'vscode';
 import { Commands, OpenInRemoteCommandArgs } from '../commands';
 import { CommandQuickPickItem, getQuickPickIgnoreFocusOut } from './common';
 import { GlyphChars } from '../constants';
-import { getNameFromRemoteResource, GitLogCommit, GitRemote, GitService, RemoteResource } from '../gitService';
+import { getNameFromRemoteResource, GitLogCommit, GitRemote, RemoteResource } from '../gitService';
 import * as path from 'path';

 export class OpenRemoteCommandQuickPickItem extends CommandQuickPickItem {
@@ -38,12 +38,8 @@ export class OpenRemotesCommandQuickPickItem extends CommandQuickPickItem {
                description = `$(git-branch) ${resource.branch}`;
                break;

-            case 'branches':
-                description = `$(git-branch) Branches`;
-                break;
-
            case 'commit':
-                const shortSha = GitService.shortenSha(resource.sha);
+                const shortSha = resource.sha.substring(0, 8);
                description = `$(git-commit) ${shortSha}`;
                break;

@@ -67,7 +63,7 @@ export class OpenRemotesCommandQuickPickItem extends CommandQuickPickItem {
                    }
                }
                else {
-                    const shortFileSha = resource.sha === undefined ? '' : GitService.shortenSha(resource.sha);
+                    const shortFileSha = resource.sha === undefined ? '' : resource.sha.substring(0, 8);
                    description = `$(file-text) ${path.basename(resource.fileName)}${shortFileSha ? ` in ${GlyphChars.Space}$(git-commit) ${shortFileSha}` : ''}`;
                }
                break;
--- a/src/quickPicks/repoStatus.ts
+++ b/src/quickPicks/repoStatus.ts
@@ -4,7 +4,7 @@ import { commands, QuickPickOptions, TextDocumentShowOptions, Uri, window } from
 import { Commands, DiffWithWorkingCommandArgs, OpenChangedFilesCommandArgs, ShowQuickBranchHistoryCommandArgs, ShowQuickRepoStatusCommandArgs, ShowQuickStashListCommandArgs } from '../commands';
 import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, OpenFileCommandQuickPickItem, QuickPickItem } from './common';
 import { GlyphChars } from '../constants';
-import { GitService, GitStatus, GitStatusFile, GitUri } from '../gitService';
+import { GitStatus, GitStatusFile, GitUri } from '../gitService';
 import { Keyboard, Keys } from '../keyboard';
 import * as path from 'path';

@@ -156,7 +156,7 @@ export class RepoStatusQuickPick {
        }

        items.splice(0, 0, new CommandQuickPickItem({
-            label: `$(inbox) Show Stashed Changes`,
+            label: `$(repo) Show Stashed Changes`,
            description: `${Strings.pad(GlyphChars.Dash, 2, 3)} shows stashed changes in the repository`
        }, Commands.ShowQuickStashList, [
                new GitUri(Uri.file(status.repoPath), { fileName: '', repoPath: status.repoPath }),
@@ -182,7 +182,7 @@ export class RepoStatusQuickPick {
        if (status.upstream && status.state.behind) {
            items.splice(0, 0, new CommandQuickPickItem({
                label: `$(cloud-download)${GlyphChars.Space} ${status.state.behind} Commit${status.state.behind > 1 ? 's' : ''} behind ${GlyphChars.Space}$(git-branch) ${status.upstream}`,
-                description: `${Strings.pad(GlyphChars.Dash, 2, 3)} shows commits in ${GlyphChars.Space}$(git-branch) ${status.upstream} but not ${GlyphChars.Space}$(git-branch) ${status.branch}${status.sha ? ` (since ${GlyphChars.Space}$(git-commit) ${GitService.shortenSha(status.sha)})` : ''}`
+                description: `${Strings.pad(GlyphChars.Dash, 2, 3)} shows commits in ${GlyphChars.Space}$(git-branch) ${status.upstream} but not ${GlyphChars.Space}$(git-branch) ${status.branch}${status.sha ? ` (since ${GlyphChars.Space}$(git-commit) ${status.sha.substring(0, 8)})` : ''}`
            }, Commands.ShowQuickBranchHistory, [
                    new GitUri(Uri.file(status.repoPath), { fileName: '', repoPath: status.repoPath, sha: `${status.branch}..${status.upstream}` }),
                    {
--- a/src/quickPicks/stashList.ts
+++ b/src/quickPicks/stashList.ts
@@ -14,10 +14,21 @@ export class StashListQuickPick {

        if (mode === 'list') {
            items.splice(0, 0, new CommandQuickPickItem({
-                label: `$(plus) Stash Changes`,
+                label: `$(repo-push) Stash Unstaged Changes`,
+                description: `${Strings.pad(GlyphChars.Dash, 2, 3)} stashes only unstaged changes`
+            }, Commands.StashSave, [
+                    {
+                        unstagedOnly: true,
+                        goBackCommand: currentCommand
+                    } as StashSaveCommandArgs
+                ]));
+
+            items.splice(0, 0, new CommandQuickPickItem({
+                label: `$(repo-force-push) Stash Changes`,
                description: `${Strings.pad(GlyphChars.Dash, 2, 3)} stashes all changes`
            }, Commands.StashSave, [
                    {
+                        unstagedOnly: false,
                        goBackCommand: currentCommand
                    } as StashSaveCommandArgs
                ]));
--- a/src/system/string.ts
+++ b/src/system/string.ts
@@ -101,20 +101,12 @@ export namespace Strings {
        return s;
    }

-    // Removes \ / : * ? " < > | and C0 and C1 control codes
-    const illegalCharsForFSRegEx = /[\\/:*?"<>|\x00-\x1f\x80-\x9f]/g;
-
-    export function sanitizeForFS(s: string, replacement: string = '_') {
-        if (!s) return s;
-        return s.replace(illegalCharsForFSRegEx, replacement);
-    }
-
-    export function truncate(s: string, truncateTo: number, ellipsis: string = '\u2026') {
-        if (!s) return s;
+    export function truncate(s: string, truncateTo?: number) {
+        if (!s || truncateTo === undefined) return s;

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

        // 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));
@@ -127,6 +119,6 @@ export namespace Strings {
            chars--;
        }

-        return `${s.substring(0, chars)}${ellipsis}`;
+        return `${s.substring(0, chars)}\u2026`;
    }
 }
--- a/src/views/branchHistoryNode.ts
+++ b/src/views/branchHistoryNode.ts
@@ -4,29 +4,28 @@ import { ExtensionContext, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { CommitNode } from './commitNode';
 import { GlyphChars } from '../constants';
 import { ExplorerNode, ResourceType } from './explorerNode';
-import { GitBranch, GitService, GitUri } from '../gitService';
+import { GitBranch, GitRemote, GitService, GitUri } from '../gitService';

 export class BranchHistoryNode extends ExplorerNode {

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

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

        async getChildren(): Promise<ExplorerNode[]> {
-            const log = await this.git.getLogForRepo(this.uri.repoPath!, this.branch.name, 0);
+            const log = await this.git.getLogForRepo(this.uri.repoPath!, this.branch.name);
            if (log === undefined) return [];

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

        async getTreeItem(): Promise<TreeItem> {
-            let name = this.branch.getName();
-            if (!this.branch.remote && this.branch.tracking !== undefined && this.git.config.gitExplorer.showTrackingBranch) {
-                name += ` ${GlyphChars.Space}${GlyphChars.ArrowLeftRight}${GlyphChars.Space} ${this.branch.tracking}`;
-            }
-            const item = new TreeItem(`${this.branch!.current ? `${GlyphChars.Check} ${GlyphChars.Space}` : ''}${name}`, TreeItemCollapsibleState.Collapsed);
+            const name = this.remote !== undefined
+                ? this.branch.name.substring(this.remote.name.length + 1)
+                : this.branch.name;
+            const item = new TreeItem(`${name}${this.branch!.current ? ` ${GlyphChars.Space} ${GlyphChars.Check}` : ''}`, TreeItemCollapsibleState.Collapsed);
            item.contextValue = this.resourceType;

            item.iconPath = {
--- a/src/views/branchesNode.ts
+++ b/src/views/branchesNode.ts
@@ -18,7 +18,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, undefined, this.uri, this.git.config.gitExplorer.commitFormat, this.context, this.git))];
        }

        getTreeItem(): TreeItem {
--- a/src/views/commitFileNode.ts
+++ b/src/views/commitFileNode.ts
@@ -40,6 +40,16 @@ export class CommitFileNode extends ExplorerNode {
    }

    getCommand(): Command | undefined {
+        let allowMissingPrevious = false;
+        let prefix = undefined;
+        if (this.status.status === 'A') {
+            allowMissingPrevious = true;
+            prefix = 'added in ';
+        }
+        else if (this.status.status === 'D') {
+            prefix = 'deleted in ';
+        }
+
        return {
            title: 'Compare File with Previous Revision',
            command: Commands.DiffWithPrevious,
@@ -51,7 +61,9 @@ export class CommitFileNode extends ExplorerNode {
                    showOptions: {
                        preserveFocus: true,
                        preview: true
-                    }
+                    },
+                    allowMissingPrevious: allowMissingPrevious,
+                    rightTitlePrefix: prefix
                } as DiffWithPreviousCommandArgs
            ]
        };
--- a/src/views/commitNode.ts
+++ b/src/views/commitNode.ts
@@ -4,8 +4,7 @@ import { Command, ExtensionContext, TreeItem, TreeItemCollapsibleState } from 'v
 import { Commands, DiffWithPreviousCommandArgs } from '../commands';
 import { CommitFileNode } from './commitFileNode';
 import { ExplorerNode, ResourceType } from './explorerNode';
-import { CommitFormatter, getGitStatusIcon, GitLogCommit, GitService, GitUri, ICommitFormatOptions } from '../gitService';
-import * as path from 'path';
+import { CommitFormatter, GitLogCommit, GitService, GitUri } from '../gitService';

 export class CommitNode extends ExplorerNode {

@@ -28,37 +27,38 @@ export class CommitNode extends ExplorerNode {
    }

    getTreeItem(): TreeItem {
-        const item = new TreeItem(CommitFormatter.fromTemplate(this.template, this.commit, {
-            truncateMessageAtNewLine: true,
-            dataFormat: this.git.config.defaultDateFormat
-        } as ICommitFormatOptions));
-
+        const item = new TreeItem(CommitFormatter.fromTemplate(this.template, this.commit, this.git.config.defaultDateFormat));
        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.iconPath = {
+            dark: this.context.asAbsolutePath('images/dark/icon-commit.svg'),
+            light: this.context.asAbsolutePath('images/light/icon-commit.svg')
+        };
+
        return item;
    }

    getCommand(): Command | undefined {
+        let allowMissingPrevious = false;
+        let prefix = undefined;
+        const status = this.commit.fileStatuses[0];
+        if (status.status === 'A') {
+            allowMissingPrevious = true;
+            prefix = 'added in ';
+        }
+        else if (status.status === 'D') {
+            prefix = 'deleted in ';
+        }
+
        return {
            title: 'Compare File with Previous Revision',
            command: Commands.DiffWithPrevious,
@@ -70,7 +70,9 @@ export class CommitNode extends ExplorerNode {
                    showOptions: {
                        preserveFocus: true,
                        preview: true
-                    }
+                    },
+                    allowMissingPrevious: allowMissingPrevious,
+                    rightTitlePrefix: prefix
                } as DiffWithPreviousCommandArgs
            ]
        };
--- a/src/views/gitExplorer.ts
+++ b/src/views/gitExplorer.ts
@@ -1,12 +1,11 @@
 'use strict';
-import { Functions, Objects } from '../system';
-import { commands, Event, EventEmitter, ExtensionContext, TextDocumentShowOptions, TextEditor, TreeDataProvider, TreeItem, Uri, window, workspace } from 'vscode';
+import { Functions } from '../system';
+import { commands, Event, EventEmitter, ExtensionContext, TextDocumentShowOptions, TextEditor, TreeDataProvider, TreeItem, Uri, window } from 'vscode';
 import { Commands, DiffWithPreviousCommandArgs, DiffWithWorkingCommandArgs, openEditor, OpenFileInRemoteCommandArgs } from '../commands';
 import { UriComparer } from '../comparers';
-import { ExtensionKey, IConfig } from '../configuration';
 import { CommandContext, setCommandContext } from '../constants';
 import { CommitFileNode, CommitNode, ExplorerNode, HistoryNode, MessageNode, RepositoryNode, StashNode } from './explorerNodes';
-import { GitService, GitUri, RepoChangedReasons } from '../gitService';
+import { GitService, GitUri } from '../gitService';

 export * from './explorerNodes';

@@ -25,7 +24,6 @@ export interface OpenFileRevisionCommandArgs {

 export class GitExplorer implements TreeDataProvider<ExplorerNode> {

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

@@ -45,18 +43,11 @@ export class GitExplorer implements TreeDataProvider<ExplorerNode> {
        commands.registerCommand('gitlens.gitExplorer.openFileRevisionInRemote', this.openFileRevisionInRemote, this);
        commands.registerCommand('gitlens.gitExplorer.openChangedFiles', this.openChangedFiles, this);
        commands.registerCommand('gitlens.gitExplorer.openChangedFileRevisions', this.openChangedFileRevisions, this);
-        commands.registerCommand('gitlens.gitExplorer.applyChanges', this.applyChanges, this);

-        const repoChangedFn = Functions.debounce(this.onRepoChanged, 250);
-        context.subscriptions.push(this.git.onDidChangeRepo(repoChangedFn, this));
+        const fn = Functions.debounce(this.onActiveEditorChanged, 500);
+        context.subscriptions.push(window.onDidChangeActiveTextEditor(fn, this));

-        const editorChangedFn = Functions.debounce(this.onActiveEditorChanged, 500);
-        context.subscriptions.push(window.onDidChangeActiveTextEditor(editorChangedFn, this));
-        context.subscriptions.push(workspace.onDidChangeConfiguration(this.onConfigurationChanged, this));
-
-        this.onConfigurationChanged();
-
-        this._view = this._config.gitExplorer.view;
+        this._view = this.git.config.gitExplorer.view;
        setCommandContext(CommandContext.GitExplorerView, this._view);
        this._root = this.getRootNode();
    }
@@ -98,39 +89,15 @@ export class GitExplorer implements TreeDataProvider<ExplorerNode> {

    private onActiveEditorChanged(editor: TextEditor | undefined) {
        if (this._view !== GitExplorerView.History) return;
-
        const root = this.getRootNode(editor);
        if (root === this._root) return;

-        this._root = root;
-        this.refresh(undefined, root);
+        this.refresh(root);
    }

-    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);
-        }
-
-        this._config = cfg;
-    }
-
-    private onRepoChanged(reasons: RepoChangedReasons[]) {
-        if (this._view !== GitExplorerView.Repository) return;
-
-        this.refresh();
-    }
-
-    refresh(node?: ExplorerNode, root?: ExplorerNode) {
-        if (root === undefined && this._view === GitExplorerView.History) {
-            this._root = this.getRootNode(window.activeTextEditor);
-        }
-
-        this._onDidChangeTreeData.fire(node);
+    refresh(root?: ExplorerNode) {
+        this._root = root || this.getRootNode();
+        this._onDidChangeTreeData.fire();
    }

    switchTo(view: GitExplorerView) {
@@ -139,15 +106,10 @@ export class GitExplorer implements TreeDataProvider<ExplorerNode> {
        this._view = view;
        setCommandContext(CommandContext.GitExplorerView, this._view);

-        this._root = this.getRootNode(window.activeTextEditor);
+        this._root = undefined;
        this.refresh();
    }

-    private async applyChanges(node: CommitNode | StashNode) {
-        await this.git.checkoutFile(node.uri);
-        return this.openFile(node);
-    }
-
    private openChanges(node: CommitNode | StashNode) {
        const command = node.getCommand();
        if (command === undefined || command.arguments === undefined) return;
@@ -188,7 +150,7 @@ export class GitExplorer implements TreeDataProvider<ExplorerNode> {
    private async openChangedFileRevisions(node: CommitNode | StashNode, options: TextDocumentShowOptions = { preserveFocus: false, preview: false }) {
        const uris = node.commit.fileStatuses
            .filter(s => s.status !== 'D')
-            .map(s => GitService.toGitContentUri(node.commit.sha, s.fileName, node.commit.repoPath, s.originalFileName));
+            .map(s => GitService.toGitContentUri(node.commit.sha, node.commit.shortSha, s.fileName, node.commit.repoPath, s.originalFileName));
        for (const uri of uris) {
            await openEditor(uri, options);
        }
--- a/src/views/remoteNode.ts
+++ b/src/views/remoteNode.ts
@@ -18,7 +18,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.remote, this.uri, this.git.config.gitExplorer.commitFormat, this.context, this.git))];
        }

        getTreeItem(): TreeItem {
--- a/src/views/remotesNode.ts
+++ b/src/views/remotesNode.ts
@@ -1,7 +1,7 @@
 'use strict';
 import { Arrays, Iterables } from '../system';
 import { ExtensionContext, TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { ExplorerNode, MessageNode, ResourceType } from './explorerNode';
+import { ExplorerNode, ResourceType } from './explorerNode';
 import { GitService, GitUri } from '../gitService';
 import { RemoteNode } from './remoteNode';

@@ -15,7 +15,7 @@ export class RemotesNode extends ExplorerNode {

        async getChildren(): Promise<ExplorerNode[]> {
            const remotes = Arrays.uniqueBy(await this.git.getRemotes(this.uri.repoPath!), r => r.url, r => !!r.provider);
-            if (remotes === undefined || remotes.length === 0) return [new MessageNode('No remotes configured')];
+            if (remotes === undefined) return [];

            remotes.sort((a, b) => a.name.localeCompare(b.name));
            return [...Iterables.map(remotes, r => new RemoteNode(r, this.uri, this.context, this.git))];
--- a/src/views/stashNode.ts
+++ b/src/views/stashNode.ts
@@ -1,7 +1,7 @@
 'use strict';
 import { Event, EventEmitter, ExtensionContext, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { ExplorerNode, ResourceType } from './explorerNode';
-import { CommitFormatter, GitService, GitStashCommit, GitUri, ICommitFormatOptions } from '../gitService';
+import { CommitFormatter, GitService, GitStashCommit, GitUri } from '../gitService';
 import { StashFileNode } from './stashFileNode';

 export class StashNode extends ExplorerNode {
@@ -22,10 +22,9 @@ export class StashNode extends ExplorerNode {
    }

    getTreeItem(): TreeItem {
-        const item = new TreeItem(CommitFormatter.fromTemplate(this.git.config.gitExplorer.stashFormat, this.commit, {
-            truncateMessageAtNewLine: true,
-            dataFormat: this.git.config.defaultDateFormat
-        } as ICommitFormatOptions), TreeItemCollapsibleState.Collapsed);
+        const label = CommitFormatter.fromTemplate(this.git.config.gitExplorer.stashFormat, this.commit, this.git.config.defaultDateFormat);
+
+        const item = new TreeItem(label, TreeItemCollapsibleState.Collapsed);
        item.contextValue = this.resourceType;
        return item;
    }
--- a/src/views/statusNode.ts
+++ b/src/views/statusNode.ts
@@ -34,7 +34,6 @@ export class StatusNode extends ExplorerNode {

        let hasChildren = false;
        let label = '';
-        let iconSuffix = '';
        if (status.upstream) {
            if (!status.state.ahead && !status.state.behind) {
                label = `${status.branch} is up-to-date with ${status.upstream}`;
@@ -42,15 +41,6 @@ export class StatusNode extends ExplorerNode {
            else {
                label = `${status.branch} is not up-to-date with ${status.upstream}`;
                hasChildren = true;
-                if (status.state.ahead && status.state.behind) {
-                    iconSuffix = '-yellow';
-                }
-                else if (status.state.ahead) {
-                    iconSuffix = '-green';
-                }
-                else if (status.state.behind) {
-                    iconSuffix = '-red';
-                }
            }
        }
        else {
@@ -61,8 +51,8 @@ export class StatusNode extends ExplorerNode {
        item.contextValue = this.resourceType;

        item.iconPath = {
-            dark: this.context.asAbsolutePath(`images/dark/icon-repo${iconSuffix}.svg`),
-            light: this.context.asAbsolutePath(`images/light/icon-repo${iconSuffix}.svg`)
+            dark: this.context.asAbsolutePath('images/dark/icon-repo.svg'),
+            light: this.context.asAbsolutePath('images/light/icon-repo.svg')
        };

        return item;
--- a/src/views/statusUpstreamNode.ts
+++ b/src/views/statusUpstreamNode.ts
@@ -17,7 +17,7 @@ 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);
+        let log = await this.git.getLogForRepo(this.uri.repoPath!, range);
        if (log === undefined) return [];

        if (this.direction !== 'ahead') return [...Iterables.map(log.commits.values(), c => new CommitNode(c, this.template, this.context, this.git))];
@@ -37,8 +37,8 @@ export class StatusUpstreamNode extends ExplorerNode {

    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;