bash prompt: support for pending git operations

merge, rebase, am:
* list number of conflicts, successful merges and untracked files
* show which commit gets merged with / rebased onto which other commit

bisect:
* show "bisect" and current commit

other pending ops (for now only recognises locked):
* show op instead of branch
vim powerline: brighter statusline