diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 16:37:18 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 16:37:18 +0300 |
commit | 8c758f9a67a265ae51beddfd9895d48a42c2af13 (patch) | |
tree | 555c2d42a1ef3f8d69c64a77fbdb0690d529ff3b /cache.h | |
parent | c657aa0525ed04fbec8901169b8a1fd5bcb877b4 (diff) | |
parent | 58b284a2e9123588eedc8c5ee17e8b069d9454f8 (diff) |
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()
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -962,11 +962,13 @@ extern int grafts_replace_parents; extern int repository_format_precious_objects; extern char *repository_format_partial_clone; extern const char *core_partial_clone_filter_default; +extern int repository_format_worktree_config; struct repository_format { int version; int precious_objects; char *partial_clone; /* value of extensions.partialclone */ + int worktree_config; int is_bare; int hash_algo; char *work_tree; |