X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=environment.c;h=81a36824f03203e41702d9df3ee9c1658f1af7e4;hb=43dd2332853b2460a5252b0f43d8de3c5b545b9a;hp=83d38d3c2354e8582d5af91c6d529a2f2836dc2c;hpb=223a923c37f76ee91eb6a9cb77ce6d31dcf939cc;p=git.git diff --git a/environment.c b/environment.c index 83d38d3c2..81a36824f 100644 --- a/environment.c +++ b/environment.c @@ -53,6 +53,7 @@ enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE; char *notes_ref_name; int grafts_replace_parents = 1; int core_apply_sparse_checkout; +int merge_renormalize; /* Parallel index stat data preload? */ int core_preload_index = 0;