author | Junio C Hamano <gitster@pobox.com> | |
Thu, 23 Dec 2010 23:46:52 +0000 (15:46 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 23 Dec 2010 23:46:52 +0000 (15:46 -0800) | ||
commit | a2bc4196629a6283bfed75aa60ad6aece230cd61 | |
tree | ebe4ec0110209f87f5666783e3f6e590b69ac59b | tree | snapshot |
parent | fd4361f2759da9a374b38e6583957fb79747237b | commit | diff |
parent | e7d1efbe9dc5c03e65a573d6f8c4d8804118eb0a | commit | diff |
Merge branch 'nd/setup' into next
* nd/setup: (46 commits)
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
t1510: setup case #24
...
* nd/setup: (46 commits)
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
t1510: setup case #24
...
Documentation/config.txt | diff1 | | diff2 | | blob | history |
Documentation/git.txt | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
config.c | diff1 | | diff2 | | blob | history |
environment.c | diff1 | | diff2 | | blob | history |
git.c | diff1 | | diff2 | | blob | history |
setup.c | diff1 | | diff2 | | blob | history |
t/t0001-init.sh | diff1 | | diff2 | | blob | history |
trace.c | diff1 | | diff2 | | blob | history |