From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Sep 2007 18:32:58 +0000 (-0700)
Subject: Merge branch 'master' into ph/strbuf
X-Git-Tag: v1.5.4-rc0~295^2~26
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ddb95de33e99d547c3b533aea12f18c9e4dd649e;p=git.git

Merge branch 'master' into ph/strbuf

* master:
  archive - leakfix for format_subst()
  Make --no-thin the default in git-push to save server resources
  fix doc for --compression argument to pack-objects
  git-tag -s must fail if gpg cannot sign the tag.
  git-svn: understand grafts when doing dcommit
  git-diff: don't squelch the new SHA1 in submodule diffs
  Define NO_MEMMEM on Darwin as it lacks the function
  git-svn: fix "Malformed network data" with svn:// servers
  (cvs|svn)import: Ask git-tag to overwrite old tags.
  git-rebase: fix -C option
  git-rebase: support --whitespace=<option>
  Documentation / grammer nit
  archive: rename attribute specfile to export-subst
  archive: specfile syntax change: "$Format:%PLCHLDR$" instead of just "%PLCHLDR" (take 2)
  add memmem()
  Remove unused function convert_sha1_file()
  archive: specfile support (--pretty=format: in archive files)
  Export format_commit_message()
---

ddb95de33e99d547c3b533aea12f18c9e4dd649e