From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Feb 2008 22:33:19 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~221
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aa8d53ec387a7baf72ab5e3a91c35bb5bf20eb4d;p=git.git

Merge branch 'maint'

* maint:
  config: add test cases for empty value and no value config variables.
  cvsimport: have default merge regex also match beginning of commit message
  git clone -s documentation: force a new paragraph for the NOTE
  status: suggest "git rm --cached" to unstage for initial commit
  Protect get_author_ident_from_commit() from filenames in work tree
  upload-pack: Initialize the exec-path.
  bisect: use verbatim commit subject in the bisect log
  git-cvsimport.txt: fix '-M' description.
  Revert "pack-objects: only throw away data during memory pressure"
---

aa8d53ec387a7baf72ab5e3a91c35bb5bf20eb4d