diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b6215d..8f7a6c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -225,7 +225,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds `gitlens.resultsExplorer.gravatars` setting to specify whether or not to show gravatar images instead of commit (or status) icons in the **GitLens Results** view - Adds `gitlens.resultsExplorer.gravatarsDefault` setting to specify the style of the gravatar default (fallback) images in the **GitLens Results** view
`identicon` - a geometric pattern
`mm` - (mystery-man) a simple, cartoon-style silhouetted outline of a person (does not vary by email hash)
`monsterid` - a monster with different colors, faces, etc
`retro` - 8-bit arcade-style pixelated faces
`robohash` - a robot with different colors, faces, etc
`wavatar` - faces with differing features and backgrounds -- Adds *Select for Compare* command (`gitlens.explorers.selectForCompare`) to branch, remote branch, tag, and revision (commit) nodes in the **GitLens** view to mark the base reference of a comparision +- Adds *Select for Compare* command (`gitlens.explorers.selectForCompare`) to branch, remote branch, tag, and revision (commit) nodes in the **GitLens** view to mark the base reference of a comparison - Adds *Compare with Selected* command (`gitlens.explorers.compareWithSelected`) to branch, remote branch, tag, and revision (commit) nodes in the **GitLens** view once another reference within the same repository has been selected to compare the current selection with the previously selected reference in the **GitLens Results** view - Adds an all-new, on-demand **GitLens Results** view to the Explorer activity diff --git a/README.md b/README.md index de998e9..537d2d5 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,11 @@ GitLens is a free, [open-source](https://github.com/eamodio/vscode-gitlens "Open GitLens on GitHub") extension for [Visual Studio Code](https://code.visualstudio.com) created by [Eric Amodio](http://amod.io "Learn more about Eric"). -GitLens simply helps you understand code better. Quickly glimpse into who, why, and when a line or code block was changed. Jump back through history to gain further insights as to how and why the code evolved. Explore the history and evolution of a codebase. +GitLens simply helps you understand code better. Quickly glimpse into whom, why, and when a line or code block was changed. Jump back through history to gain further insights as to how and why the code evolved. Explore the history and evolution of a codebase. Here are just some of the features that GitLens provides, - a [*GitLens* explorer](#gitlens-explorer "Jump to the GitLens explorer") to navigate and explore repositories or file histories - - an on-demand [*GitLens Results* view](#gitlens-results-view "Jump to the GitLens Results view") to explore commit searches, visualize comparisions between branches, tags, commits, and more + - an on-demand [*GitLens Results* view](#gitlens-results-view "Jump to the GitLens Results view") to explore commit searches, visualize comparisons between branches, tags, commits, and more - authorship [code lens](#code-lens "Jump to the Code Lens") showing the most recent commit and # of authors to the top of files and/or on code blocks - an unobtrusive [current line blame](#current-line-blame "Jump to the Current Line Blame") annotation at the end of the line - on-demand [gutter blame](#gutter-blame "Jump to the Gutter Blame") annotations, including a heatmap, for the whole file @@ -65,7 +65,7 @@ The repository view provides a full Git repository explorer, which has the follo - is behind the upstream — quickly see and explore the specific commits behind the upstream (i.e. commits that haven't been pulled) - is ahead of the upstream — quickly see and explore the specific commits ahead of the upstream (i.e. commits that haven't been pushed) - A context menu provides *Open Repository in Remote*, and *Refresh* commands - - **Changed Files** — lists all of the "working" changes + - **Changed Files** — lists all the "working" changes - Expands to a file-based view of all changed files in the working tree ([optionally](#gitlens-explorer-settings "Jump to the GitLens explorer settings")) and/or all files in all commits ahead of the upstream - **Branches** — lists the local branches @@ -127,12 +127,12 @@ The history view provides the revision history of the active file, which has the GitLens Results view

-An on-demand, [customizable](#gitlens-results-view-settings "Jump to the GitLens Results view settings") view to explore commits, histories, and searches, or visualize comparisions between branches, tags, commits, and more +An on-demand, [customizable](#gitlens-results-view-settings "Jump to the GitLens Results view settings") view to explore commits, histories, and searches, or visualize comparisons between branches, tags, commits, and more - A toolbar provides *Search Commits*, *Keep Results*, and *Refresh* commands - A context menu provides *Automatic Layout*, *List Layout*, *Tree Layout*, and *Close* commands #### Explore - - Provides a semi-persistent results view for exploring histories, commits, and searchs + - Provides a semi-persistent results view for exploring histories, commits, and searches - Accessible via the following commands - *Show Commit Search* command (`gitlens.showCommitSearch`) - *Show File History* command (`gitlens.showQuickFileHistory`) diff --git a/src/commands/diffDirectory.ts b/src/commands/diffDirectory.ts index 670675f..52ba543 100644 --- a/src/commands/diffDirectory.ts +++ b/src/commands/diffDirectory.ts @@ -4,7 +4,7 @@ import { ActiveEditorCommand, Commands, getCommandUri } from './common'; import { CommandContext, isCommandViewContextWithRef } from '../commands'; import { BuiltInCommands, GlyphChars } from '../constants'; import { Container } from '../container'; -import { ComparisionResultsNode } from '../views/explorerNodes'; +import { ComparisonResultsNode } from '../views/explorerNodes'; import { Logger } from '../logger'; import { Messages } from '../messages'; import { BranchesAndTagsQuickPick, CommandQuickPickItem } from '../quickPicks'; @@ -28,7 +28,7 @@ export class DiffDirectoryCommand extends ActiveEditorCommand { break; case Commands.ExplorersOpenDirectoryDiff: - if (context.type === 'view' && context.node instanceof ComparisionResultsNode) { + if (context.type === 'view' && context.node instanceof ComparisonResultsNode) { args.ref1 = context.node.ref1; args.ref2 = context.node.ref2; } diff --git a/src/ui/settings/index.html b/src/ui/settings/index.html index 88d55c9..f3e92b4 100644 --- a/src/ui/settings/index.html +++ b/src/ui/settings/index.html @@ -111,7 +111,7 @@ -

Adds an on-demand GitLens Results view to explore commits, histories, and searches, or visualize comparisions between branches, tags, commits, and more

+

Adds an on-demand GitLens Results view to explore commits, histories, and searches, or visualize comparisons between branches, tags, commits, and more

diff --git a/src/ui/welcome/index.html b/src/ui/welcome/index.html index cfd58a6..2c3a0f5 100644 --- a/src/ui/welcome/index.html +++ b/src/ui/welcome/index.html @@ -59,14 +59,14 @@ href="http://amod.io/?utm_source=gitlens">Eric Amodio.

- GitLens simply helps you understand code better. Quickly glimpse into who, why, and when a line or code block was changed. + GitLens simply helps you understand code better. Quickly glimpse into whom, why, and when a line or code block was changed. Jump back through history to gain further insights as to how and why the code evolved. Explore the history and evolution of a codebase. Dive right in and see how GitLens can help!

Here are just some of the features that GitLens provides,