From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Sep 2007 07:14:50 +0000 (-0700)
Subject: Merge branch 'rs/archive'
X-Git-Tag: v1.5.4-rc0~451
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6972ab7ae10a205bbc05b98408a36403915a9c39;p=git.git

Merge branch 'rs/archive'

* rs/archive:
  archive - leakfix for format_subst()
  Define NO_MEMMEM on Darwin as it lacks the function
  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()
---

6972ab7ae10a205bbc05b98408a36403915a9c39