Merge branch 'sb/fetch'

* sb/fetch:
merge and resolve: Output short hashes and .. in "Updating ..."
fetch: Misc output cleanup

diff --cc git-fetch.sh
Simple merge