From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 8 Aug 2009 03:44:49 +0000 (-0700)
Subject: Merge branch 'maint' into jc/verify-pack-stat
X-Git-Tag: v1.6.5-rc0~46^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7ecc9b153c89aeec7470256f7b121fd845101b57;p=git.git

Merge branch 'maint' into jc/verify-pack-stat

* maint: (95 commits)
  verify-pack -v: do not report "chain length 0"
  t5510: harden the way verify-pack is used
  gitweb/README: Document $base_url
  Documentation: git submodule: add missing options to synopsis
  Better usage string for reflog.
  hg-to-git: don't import the unused popen2 module
  send-email: remove debug trace
  config: Keep inner whitespace verbatim
  GIT 1.6.4
  GIT 1.6.3.4
  config.txt: document add.ignore-errors
  request-pull: allow ls-remote to notice remote.$nickname.uploadpack
  Update the documentation of the raw diff output format
  git-rerere.txt: Clarify ambiguity of the config variable
  t9143: do not fail if Compress::Zlib is missing
  Trivial path quoting fixes in git-instaweb
  GIT 1.6.4-rc3
  Documentation/config.txt: a variable can be defined on the section header line
  git svn: make minimize URL more reliable over http(s)
  Disable asciidoc 8.4.1+ semantics for `{plus}` and friends
  ...
---

7ecc9b153c89aeec7470256f7b121fd845101b57