Merge branch 'sb/fetch' into jc/refs-and-fetch

* sb/fetch: (41 commits)
  merge and resolve: Output short hashes and .. in "Updating ..."
  fetch: Misc output cleanup
  gitweb: tree view: hash_base and hash are now context sensitive
  fetch: Reset remote refs list each time fetch_main is called
  Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34
  git-diff -B output fix.
  Make cvsexportcommit remove files.
  diff --stat: ensure at least one '-' for deletions, and one '+' for additions
  diff --stat=width[,name-width]: allow custom diffstat output width.
  gitweb: History: blob and tree are first, then commitdiff, etc
  gitweb: Remove redundant "commit" from history
  http/ftp: optionally ask curl to not use EPSV command
  gitweb: Don't use quotemeta on internally generated strings
  gitweb: Add snapshot to shortlog
  gitweb: Factor out gitweb_have_snapshot()
  gitweb: Remove redundant "commit" link from shortlog
  gitweb: "alternate" starts with shade (i.e. 1)
  git-format-patch: fix bug using -o in subdirectories
  do not discard constness in interp_set_entry value argument
  Fix approxidate() to understand more extended numbers
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/git-merge.sh b/git-merge.sh
index 5b34b4de9..49c46d55d 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -197,7 +197,7 @@ f,*)
 	;;
 ?,1,"$head",*)
 	# Again the most common case of merging one remote.
-	echo "Updating from $head to $1"
+	echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
 	git-update-index --refresh 2>/dev/null
 	new_head=$(git-rev-parse --verify "$1^0") &&
 	git-read-tree -u -v -m $head "$new_head" &&