Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Oh My Zsh
Commits
f75f8bb9
Unverified
Commit
f75f8bb9
authored
Jan 28, 2021
by
Aidin Gharibnavaz
Committed by
GitHub
Jan 27, 2021
Browse files
docs(git-prompt): explain stashed icon (⚑) (#9619)
Stashed icon was added in #4880
parent
d978f385
Changes
1
Show whitespace changes
Inline
Side-by-side
plugins/git-prompt/README.md
View file @
f75f8bb9
...
@@ -24,6 +24,7 @@ The prompt may look like the following:
...
@@ -24,6 +24,7 @@ The prompt may look like the following:
-
`(master|✖2✚3)`
: on branch
`master`
, 2 conflicts, 3 files changed
-
`(master|✖2✚3)`
: on branch
`master`
, 2 conflicts, 3 files changed
-
`(experimental↓2↑3|✔)`
: on branch
`experimental`
; your branch has diverged by 3 commits, remote by 2 commits; the repository is otherwise clean
-
`(experimental↓2↑3|✔)`
: on branch
`experimental`
; your branch has diverged by 3 commits, remote by 2 commits; the repository is otherwise clean
-
`(:70c2952|✔)`
: not on any branch; parent commit has hash
`70c2952`
; the repository is otherwise clean
-
`(:70c2952|✔)`
: not on any branch; parent commit has hash
`70c2952`
; the repository is otherwise clean
-
`(master|⚑2)`
: on branch
`master`
, there are 2 stashed changes
## Prompt Structure
## Prompt Structure
...
@@ -43,6 +44,7 @@ The symbols are as follows:
...
@@ -43,6 +44,7 @@ The symbols are as follows:
| ●n | there are
`n`
staged files |
| ●n | there are
`n`
staged files |
| ✖n | there are
`n`
unmerged files |
| ✖n | there are
`n`
unmerged files |
| ✚n | there are
`n`
unstaged files |
| ✚n | there are
`n`
unstaged files |
| ⚑n | there are
`n`
stashed changes |
| … | there are some untracked files |
| … | there are some untracked files |
### Branch Tracking Symbols
### Branch Tracking Symbols
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment