From: Junio C Hamano <junkio@cox.net>
Date: Sun, 1 Oct 2006 07:34:58 +0000 (-0700)
Subject: Merge branch 'sb/fetch' into jc/refs-and-fetch
X-Git-Tag: v1.4.4-rc1~43^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=12f9b8a3152ff9fa48464187a83f7c6279fe5094;p=git.git

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
  ...
---

12f9b8a3152ff9fa48464187a83f7c6279fe5094