show-branch: make the current branch and merge commits stand out.

This changes the character used to mark the commits that is on the
branch from '+' to '*' for the current branch, to make it stand out.
Also we show '-' for merge commits.

When you have a handful branches with relatively long diversion, it
is easier to see which one is the current branch this way.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-01-11 14:02:38 -08:00
parent 54f9734ec8
commit ebedc31952
5 changed files with 64 additions and 49 deletions

View File

@ -118,8 +118,8 @@ cat > show-branch.expect << EOF
* [master] Merged "mybranch" changes.
! [mybranch] Some work.
--
+ [master] Merged "mybranch" changes.
++ [mybranch] Some work.
- [master] Merged "mybranch" changes.
*+ [mybranch] Some work.
EOF
git show-branch --topo-order master mybranch > show-branch.output
@ -142,7 +142,7 @@ cat > show-branch2.expect << EOF
! [master] Merged "mybranch" changes.
* [mybranch] Merged "mybranch" changes.
--
++ [master] Merged "mybranch" changes.
-- [master] Merged "mybranch" changes.
EOF
git show-branch --topo-order master mybranch > show-branch2.output