Git: Trim output lines on checkout

Change-Id: I84cb48f77ceae8f12269541a195afd2a652667b1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Git: Show active branch next to command in progress

Revised topic is "master (MERGING)" instead of MERGING

This should also fix topic getting stuck as REBASING

Change-Id: I934643f5b4e632318495f141536c666f775bd15d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>