Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up wording for work dir local status #516

Merged
merged 3 commits into from Jan 1, 2018
Merged

Clean up wording for work dir local status #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9402bd
Clean up wording for work dir local status
rkeithhill Dec 31, 2017
464ff69
Merge branch 'master' into rkeithhill/fix-status-legend
rkeithhill Jan 1, 2018
bd06c5f
Merge branch 'master' into rkeithhill/fix-status-legend
dahlbyk Jan 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 5 additions & 7 deletions README.md
View file
Open in desktop
Expand Up @@ -175,19 +175,17 @@ By default, the status summary has the following format:
* `-` = Removed files
* `!` = Conflicted files
* As in `git status`, index status is dark green and working directory status is dark red
*
* W represents the status of the working folder
* `!` = There are untracked changes in the working tree (`LocalStagedStatus`)
* `~` = There are staged changes in the working tree waiting to be committed (`LocalWorkingStatus`)
* None = There are no uncommitted or unstaged changes to the working tree (`LocalDefault`)

* W represents the overall status of the working directory
* `!` = There are unstaged changes in the working tree (`LocalWorkingStatus`)
* `~` = There are uncommitted changes i.e. staged changes in the working tree waiting to be committed (`LocalStagedStatus`)
* None = There are no unstaged or uncommitted changes to the working tree (`LocalDefault`)
* `]` (`AfterText`)

The symbols and surrounding text can be customized by the corresponding properties on `$GitPromptSettings`.

For example, a status of `[master ≡ +0 ~2 -1 | +1 ~1 -0]` corresponds to the following `git status`:



```powershell
# On branch master
#
Expand Down
9 changes: 5 additions & 4 deletions src/en-US/about_posh-git.help.txt
View file
Open in desktop
Expand Up @@ -99,10 +99,11 @@ GIT STATUS SUMMARY
* Index status is dark green and working directory status is dark red
reflecting the colors used by 'git status'.

* W represents the status of the working directory
* ! = There are untracked changes (LocalStagedStatus)
* ~ = There are staged changes waiting to be committed (LocalWorkingStatus)
* None = There are no uncommitted or unstaged changes (LocalDefault)
* W represents the overall status of the working directory
* ! = There are unstaged changes (LocalWorkingStatus)
* ~ = There are uncommitted changes i.e. staged changes waiting to be
committed (LocalStagedStatus)
* None = There are no unstaged or uncommitted changes (LocalDefault)
* ] (AfterText)

The (symbols) and surrounding text can be customized by the corresponding
Expand Down