From: Junio C Hamano <junkio@cox.net>
Date: Wed, 20 Dec 2006 21:56:14 +0000 (-0800)
Subject: Merge branch 'jc/clone'
X-Git-Tag: v1.5.0-rc0~56
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa1cef54a2bcc5350df7efe1d1745725c46bf2e3;p=git.git

Merge branch 'jc/clone'

* jc/clone:
  Move "no merge candidate" warning into git-pull
  Use preprocessor constants for environment variable names.
  Do not create $GIT_DIR/remotes/ directory anymore.
  Introduce GIT_TEMPLATE_DIR
  Revert "fix testsuite: make sure they use templates freshly built from the source"
  fix testsuite: make sure they use templates freshly built from the source
  git-clone: lose the traditional 'no-separate-remote' layout
  git-clone: lose the artificial "first" fetch refspec
  git-pull: refuse default merge without branch.*.merge
  git-clone: use wildcard specification for tracking branches
---

aa1cef54a2bcc5350df7efe1d1745725c46bf2e3