Merge branch 'nd/per-worktree-config'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Nov 2018 13:37:18 +0000 (22:37 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Nov 2018 13:37:18 +0000 (22:37 +0900)
commit8c758f9a67a265ae51beddfd9895d48a42c2af13
tree555c2d42a1ef3f8d69c64a77fbdb0690d529ff3b
parentc657aa0525ed04fbec8901169b8a1fd5bcb877b4
parent58b284a2e9123588eedc8c5ee17e8b069d9454f8
Merge branch 'nd/per-worktree-config'

A fourth class of configuration files (in addition to the
traditional "system wide", "per user in the $HOME directory" and
"per repository in the $GIT_DIR/config") has been introduced so
that different worktrees that share the same repository (hence the
same $GIT_DIR/config file) can use different customization.

* nd/per-worktree-config:
  worktree: add per-worktree config files
  t1300: extract and use test_cmp_config()
Documentation/config.txt
Documentation/git-worktree.txt
cache.h