Compact text branch display

In several places, there is a text listing of branches that the current commit is on. Problem: local branches and tracked branches are separately listed, which makes the list long and difficult to understand.

Suggestion: list the tracking and tracked branches together. So, instead of:

> master, origin/master

have something like:

> [origin/]master