Merge branch 'jc/clone'
authorJunio C Hamano <junkio@cox.net>
Wed, 20 Dec 2006 21:56:14 +0000 (13:56 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 20 Dec 2006 21:56:14 +0000 (13:56 -0800)
commitaa1cef54a2bcc5350df7efe1d1745725c46bf2e3
treeb8cbf49ff59b92c36de05d08f2dfd32c4aeb538b
parent1d182bd5f4ec17f2f44ac0ee0d1bf6a25e98761e
parent4363dfbe3d2f3fe3a4bd0fa7e9b22a14532c6cdb
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
builtin-repo-config.c
config.c
merge-recursive.c