diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-11 14:02:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-15 00:04:23 -0800 |
| commit | ebedc3195258a6382f58c8c6b54b21db922440af (patch) | |
| tree | fc154c275c633b797b93cab997b8ec4110907d90 /t/t1200-tutorial.sh | |
| parent | 54f9734ec84a351395bfdd332fee3f0e7006c1da (diff) | |
| download | git-ebedc3195258a6382f58c8c6b54b21db922440af.tar.gz | |
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>
Diffstat (limited to 't/t1200-tutorial.sh')
| -rwxr-xr-x | t/t1200-tutorial.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh index d7562e9748..8ff5dd92c9 100755 --- a/t/t1200-tutorial.sh +++ b/t/t1200-tutorial.sh @@ -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 |