diff options
| author | Brandon Williams <bmwill@google.com> | 2017-06-14 11:07:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-15 12:56:22 -0700 |
| commit | b2141fc1d20e659810245ec6ca1c143c60e033ec (patch) | |
| tree | 12230b8b41fc2786e74a95809a5c3c2256266ceb /merge-recursive.c | |
| parent | f1c985da05c136414c10f034cdc09bdb6939cb8f (diff) | |
| download | git-b2141fc1d20e659810245ec6ca1c143c60e033ec.tar.gz git-b2141fc1d20e659810245ec6ca1c143c60e033ec.tar.xz | |
config: don't include config.h by default
Stop including config.h by default in cache.h. Instead only include
config.h in those files which require use of the config system.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 62decd51c..a85144c23 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -4,6 +4,7 @@ * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006 */ #include "cache.h" +#include "config.h" #include "advice.h" #include "lockfile.h" #include "cache-tree.h" |