Merge branch 'nd/multiple-work-trees' into jch
commitc7dce3a74d7a2ea1ac389799e494a2f0c5cf662e
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:35:26 +0000 (21 11:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:35:26 +0000 (21 11:35 -0700)
tree1514456cc4880b3cece28dde0d76efc3024b1301
parent7c1d8404060b0feff420b292afe96b1cf22e2184
parentbb75e4c9ffd0c0f1edfbea9bf4d4f63e4e68ff1c
Merge branch 'nd/multiple-work-trees' into jch

* nd/multiple-work-trees: (31 commits)
  checkout: don't require a work tree when checking out into a new one
  git_path(): keep "info/sparse-checkout" per work-tree
  count-objects: report unused files in $GIT_DIR/repos/...
  gc: support prune --repos
  gc: factor out gc.pruneexpire parsing code
  gc: style change -- no SP before closing parenthesis
  prune: strategies for linked checkouts
  checkout: detach if the branch is already checked out elsewhere
  checkout: clean up half-prepared directories in --to mode
  checkout: support checking out into a new working directory
  use new wrapper write_file() for simple file writing
  wrapper.c: wrapper to open a file, fprintf then close
  setup.c: support multi-checkout repo setup
  setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
  setup.c: convert check_repository_format_gently to use strbuf
  setup.c: detect $GIT_COMMON_DIR in is_git_directory()
  setup.c: convert is_git_directory() to use strbuf
  git-stash: avoid hardcoding $GIT_DIR/logs/....
  *.sh: avoid hardcoding $GIT_DIR/hooks/...
  git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
  ...
30 files changed:
Documentation/config.txt
Documentation/git-rev-parse.txt
Documentation/git.txt
Documentation/gitrepository-layout.txt
builtin/checkout.c
builtin/clone.c
builtin/commit.c
builtin/fetch.c
builtin/fsck.c
builtin/init-db.c
builtin/receive-pack.c
builtin/remote.c
builtin/repack.c
builtin/rev-parse.c
cache.h
daemon.c
fast-import.c
git-rebase--interactive.sh
git-rebase.sh
git.c
path.c
refs.c
refs.h
run-command.c
setup.c
sha1_file.c
submodule.c
trace.c
transport.c
wrapper.c