Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 22 Jun 2006 17:36:26 +0000 (10:36 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 22 Jun 2006 17:36:26 +0000 (10:36 -0700)
* 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.

Trivial merge