diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-24 23:28:40 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 23:28:41 +0200 |
| commit | f31d23a399d557d687266b4375a0436f920cc051 (patch) | |
| tree | 4f163d684ab6b66476e8795a7ea4fce4f2aa5037 /rerere.c | |
| parent | Merge branch 'bw/ls-files-sans-the-index' (diff) | |
| parent | config: don't implicitly use gitdir or commondir (diff) | |
| download | git-f31d23a399d557d687266b4375a0436f920cc051.tar.xz git-f31d23a399d557d687266b4375a0436f920cc051.zip | |
Merge branch 'bw/config-h'
Fix configuration codepath to pay proper attention to commondir
that is used in multi-worktree situation, and isolate config API
into its own header file.
* bw/config-h:
config: don't implicitly use gitdir or commondir
config: respect commondir
setup: teach discover_git_directory to respect the commondir
config: don't include config.h by default
config: remove git_config_iter
config: create config.h
Diffstat (limited to 'rerere.c')
| -rw-r--r-- | rerere.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,4 +1,5 @@ #include "cache.h" +#include "config.h" #include "lockfile.h" #include "string-list.h" #include "rerere.h" |