diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2021-03-03 13:08:41 -0700 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2021-03-03 13:08:41 -0700 |
| commit | 0f2bface6494ae546ea83cbf45b65a18dbc0c4fb (patch) | |
| tree | 5a33e6db95c55b4ad75a064b9c3e40d8f09f6b7b /plugins/git-prompt | |
| parent | c6e754a3119b7273a57f0cfed38e85303662d26b (diff) | |
| parent | 6fbad5bf72fad4ecf30ba4d4ffee62bac582f0ed (diff) | |
| download | zsh-0f2bface6494ae546ea83cbf45b65a18dbc0c4fb.tar.gz zsh-0f2bface6494ae546ea83cbf45b65a18dbc0c4fb.tar.bz2 zsh-0f2bface6494ae546ea83cbf45b65a18dbc0c4fb.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'plugins/git-prompt')
| -rw-r--r-- | plugins/git-prompt/README.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/git-prompt/README.md b/plugins/git-prompt/README.md index 83948f536..c6610fa94 100644 --- a/plugins/git-prompt/README.md +++ b/plugins/git-prompt/README.md @@ -24,6 +24,7 @@ The prompt may look like the following: - `(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 - `(: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 @@ -43,6 +44,7 @@ The symbols are as follows: | ●n | there are `n` staged files | | ✖n | there are `n` unmerged files | | ✚n | there are `n` unstaged files | +| ⚑n | there are `n` stashed changes | | … | there are some untracked files | ### Branch Tracking Symbols |