diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:18 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:18 +0900 |
| commit | 8c758f9a67a265ae51beddfd9895d48a42c2af13 (patch) | |
| tree | 555c2d42a1ef3f8d69c64a77fbdb0690d529ff3b /environment.c | |
| parent | c657aa0525ed04fbec8901169b8a1fd5bcb877b4 (diff) | |
| parent | 58b284a2e9123588eedc8c5ee17e8b069d9454f8 (diff) | |
| download | git-8c758f9a67a265ae51beddfd9895d48a42c2af13.tar.xz | |
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 'environment.c')
| -rw-r--r-- | environment.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c index 3f3c8746c2..268310b3dc 100644 --- a/environment.c +++ b/environment.c @@ -33,6 +33,7 @@ int ref_paranoia = -1; int repository_format_precious_objects; char *repository_format_partial_clone; const char *core_partial_clone_filter_default; +int repository_format_worktree_config; const char *git_commit_encoding; const char *git_log_output_encoding; const char *apply_default_whitespace; |