From 914dc999ae3c95404d65de193b8674a5e74075d9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 2 Aug 2021 06:36:18 +0200 Subject: Merging upstream version 0.15.2. Signed-off-by: Daniel Baumann --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 4b4c516..f18294e 100644 --- a/README.md +++ b/README.md @@ -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), -- cgit v1.2.3