git/gita
1
0
Fork 0
Code Issues Activity

Merging upstream version 0.15.2.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-11 18:43:12 +01:00
parent 790675feb4
commit 46da3e409a
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
4 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
README.md
View file

@ -41,11 +41,13 @@ To run arbitrary shell command, see the [shell mode section](#shell).
The branch color distinguishes 5 situations between local and remote branches:
- white: local has no remote
- green: local is the same as remote
- red: local has diverged from remote
- purple: local is ahead of remote (good for push)
- yellow: local is behind remote (good for merge)
color | meaning
---|---
white| local has no remote
green| local is the same as remote
red| local has diverged from remote
purple| local is ahead of remote (good for push)
yellow| local is behind remote (good for merge)
The choice of purple for ahead and yellow for behind is motivated by
[blueshift](https://en.wikipedia.org/wiki/Blueshift) and [redshift](https://en.wikipedia.org/wiki/Redshift),