Merge branch 'nd/setup'
commitf3bb8b4b8452f1b7add220e787ef56c737ceff6a
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 19:26:55 +0000 (28 11:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 19:26:55 +0000 (28 11:26 -0800)
tree9560624c57a06e0a1c24b7e44a9e8ebb9daaab91
parent73e7b2ef6c62b3ec345b557acb71a8da4798c70d
parent0ed748134748579a13cf27e1e8b3e55371bcd9dc
Merge branch 'nd/setup'

* nd/setup: (47 commits)
  setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd
  git.txt: correct where --work-tree path is relative to
  Revert "Documentation: always respect core.worktree if set"
  t0001: test git init when run via an alias
  Remove all logic from get_git_work_tree()
  setup: rework setup_explicit_git_dir()
  setup: clean up setup_discovered_git_dir()
  t1020-subdirectory: test alias expansion in a subdirectory
  setup: clean up setup_bare_git_dir()
  setup: limit get_git_work_tree()'s to explicit setup case only
  Use git_config_early() instead of git_config() during repo setup
  Add git_config_early()
  git-rev-parse.txt: clarify --git-dir
  t1510: setup case #31
  t1510: setup case #30
  t1510: setup case #29
  t1510: setup case #28
  t1510: setup case #27
  t1510: setup case #26
  t1510: setup case #25
  ...
.gitignore
Documentation/config.txt
Documentation/git.txt
Makefile
cache.h
config.c
environment.c
git.c
setup.c
t/t0001-init.sh
trace.c