From: Junio C Hamano <junkio@cox.net>
Date: Thu, 22 Jun 2006 17:36:26 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=738dec0ead6a96f87cf71989a1dad7bb5d1faba4;p=git.git

Merge branch 'master' into next

* master:
  git-svn: fix commit --edit flag when using SVN:: libraries
  Makefile: do not force unneeded recompilation upon GIT_VERSION changes
  Check and document the options to prevent mistakes.
  Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.
---

bf9e9542f94bc39e8bc653065d477bd25e79010e