Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
oh-my-zsh
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
github
oh-my-zsh
Commits
f75f8bb9
Unverified
Commit
f75f8bb9
authored
Jan 27, 2021
by
Aidin Gharibnavaz
Committed by
GitHub
Jan 27, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
docs(git-prompt): explain stashed icon (⚑) (#9619)
Stashed icon was added in #4880
parent
d978f385
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
README.md
plugins/git-prompt/README.md
+2
-0
No files found.
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