Merge branch 'sb/fetch'
commita4c6ae5a76f6f18876be69e5c1684f425e04bfc1
authorJunio C Hamano <junkio@cox.net>
Thu, 19 Oct 2006 05:08:29 +0000 (18 22:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 19 Oct 2006 05:08:29 +0000 (18 22:08 -0700)
tree8376d41bcb2b012159db6c4feecad08e082e667f
parent170487fbc3d7ec0f36208eed18d4ca0ea1e1acb7
parentba0ac36ec5708820e670731001f7ab35351c6c48
Merge branch 'sb/fetch'

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