Incremental improvement in git branch display.  Fixes command line
editing/completion, but wastes a line and not happy with implementation.