Merge branch 'nd/multiple-work-trees-1' into next
commit4f3a5852df85e92f610b7bdaee517265ea5aa4a7
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Aug 2014 21:24:40 +0000 (13 14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Aug 2014 21:24:40 +0000 (13 14:24 -0700)
tree9b27a853252be022c8ecb9144f0c763fc48fdf3c
parent99011c8f3d5635c96b782a8724107c305879aa2f
parent548b04d597f9d1f3e221dfdcf18bb844c1e990e9
Merge branch 'nd/multiple-work-trees-1' into next

Continue polishing nd/multiple-work-trees topic in 'next'.

* nd/multiple-work-trees-1:
  checkout --to: do not touch existing target directory
  checkout: prefix --to argument properly when cwd is moved
  environment.c: fix incorrect git_graft_file initialization
  checkout --to: fix dangling pointers in remove_junk()
  checkout: no auto-detach if the ref is already checked out
  prune --repos: fix uninitialized access
  checkout: no need to call check_linked_checkouts if head_ref is NULL
  gitrepository-layout.txt: s/ignored/ignored if/
Documentation/config.txt
Documentation/gitrepository-layout.txt
builtin/checkout.c