diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2020-02-09 17:56:17 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2020-02-09 17:56:17 +0300 |
| commit | d1ed61c9727693e382d328c8bc3a9e58be8a65bb (patch) | |
| tree | c694a2642b5848f8a9e1a766de20bd864312ba2e /README.md | |
| parent | d37cf22a9ccdf5134247ac3200f80c18f9209321 (diff) | |
docs: add ahead/behind the push remote to the legend
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -708,16 +708,18 @@ feature:master ⇣42⇡42 *42 merge ~42 +42 !42 ?42 | Symbol | Meaning | Source | | --------- | -------------------------------------------------------------------- | ------------------------------------------------------ | -| `feature` | current branch; replaced with `#tag` or `@commit` if not on a branch | `git status` | +| `feature` | current branch; replaced with `#tag` or `@commit` if not on a branch | `git status --ignore-submodules=dirty` | | `master` | remote tracking branch; only shown if different from local branch | `git rev-parse --abbrev-ref --symbolic-full-name @{u}` | -| `⇣42` | this many commits behind the remote | `git status` | -| `⇡42` | this many commits ahead of the remote | `git status` | +| `⇣42` | this many commits behind the remote | `git status --ignore-submodules=dirty` | +| `⇡42` | this many commits ahead of the remote | `git status --ignore-submodules=dirty` | +| `⇠42` | this many commits behind the push remote | `git rev-list --left-right --count HEAD...@{push}` | +| `⇢42` | this many commits ahead of the push remote | `git rev-list --left-right --count HEAD...@{push}` | | `*42` | this many stashes | `git stash list` | -| `merge` | repository state | `git status` | -| `~42` | this many merge conflicts | `git status` | -| `+42` | this many staged changes | `git status` | -| `!42` | this many unstaged changes | `git status` | -| `?42` | this many untracked files | `git status` | +| `merge` | repository state | `git status --ignore-submodules=dirty` | +| `~42` | this many merge conflicts | `git status --ignore-submodules=dirty` | +| `+42` | this many staged changes | `git status --ignore-submodules=dirty` | +| `!42` | this many unstaged changes | `git status --ignore-submodules=dirty` | +| `?42` | this many untracked files | `git status --ignore-submodules=dirty` | *Related*: [How do I change the format of Git status?](#how-do-i-change-the-format-of-git-status) |