diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-12-28 11:26:55 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-12-28 11:26:55 -0800 |
commit | f3bb8b4b8452f1b7add220e787ef56c737ceff6a (patch) | |
tree | 9560624c57a06e0a1c24b7e44a9e8ebb9daaab91 /.gitignore | |
parent | 73e7b2ef6c62b3ec345b557acb71a8da4798c70d (diff) | |
parent | 0ed748134748579a13cf27e1e8b3e55371bcd9dc (diff) | |
download | git-f3bb8b4b8452f1b7add220e787ef56c737ceff6a.tar.gz |
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
...
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 87b833c9d8..3dd6ef7d25 100644 --- a/.gitignore +++ b/.gitignore @@ -177,6 +177,7 @@ /test-sha1 /test-sigchain /test-string-pool +/test-subprocess /test-svn-fe /test-treap /common-cmds.h |