Merge branch 'ei/worktree+filter'
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Jul 2007 20:10:42 +0000 (13:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Jul 2007 20:10:42 +0000 (13:10 -0700)
commit0305b636542c8c137ed7c82fee90db8d3621118c
tree3a2a5e7a2b814b2f96c5edd681768706b9b3a048
parentcd5ada993d6a992eaed1c416f9a2ed6ba9c4cb6d
parent9489d0f197185d584294aa99a09a1b3c5ebb25e0
Merge branch 'ei/worktree+filter'

* ei/worktree+filter:
  filter-branch: always export GIT_DIR if it is set
  setup_git_directory: fix segfault if repository is found in cwd
  test GIT_WORK_TREE
  extend rev-parse test for --is-inside-work-tree
  Use new semantics of is_bare/inside_git_dir/inside_work_tree
  introduce GIT_WORK_TREE to specify the work tree
  test git rev-parse
  rev-parse: introduce --is-bare-repository
  rev-parse: document --is-inside-git-dir
Documentation/config.txt
Documentation/git-rev-parse.txt
Documentation/git.txt
builtin-ls-files.c
cache.h
connect.c
git-filter-branch.sh
git-svn.perl
git.c
setup.c
t/test-lib.sh