Merge branch 'nd/multiple-work-trees-1' into jch
commit5c6a38a93a5fc6344bc2b577ccfb95fe3e6b75e2
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:51:34 +0000 (21 11:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:51:35 +0000 (21 11:51 -0700)
treed021b110f23e803e1ec80bc101f464f58b8751ce
parentc7dce3a74d7a2ea1ac389799e494a2f0c5cf662e
parent548b04d597f9d1f3e221dfdcf18bb844c1e990e9
Merge branch 'nd/multiple-work-trees-1' into jch

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