Code

Merge branch 'master' into next v1.4.1-rc1
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)
commitbf9e9542f94bc39e8bc653065d477bd25e79010e
treeed2db94a1a96b00f843e27a93229d0616e6368fc
parentb8ca3fbd462f94b980af828528c8f1fa59601b57
parent5ab2c0a47574c92f92ea3709b23ca35d96319edd
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.