diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-25 09:45:03 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-25 09:45:03 +0200 |
| commit | 130b04ab37d74e574d525df7948b963b13c6bdbf (patch) | |
| tree | a39a6d5e46d3ee24dcc1f2f141efe4f0a20a9581 /environment.c | |
| parent | Merge branch 'av/maint-config-reader' (diff) | |
| parent | git repack: keep commits hidden by a graft (diff) | |
| download | git-130b04ab37d74e574d525df7948b963b13c6bdbf.tar.xz git-130b04ab37d74e574d525df7948b963b13c6bdbf.zip | |
Merge branch 'js/maint-graft-unhide-true-parents'
* js/maint-graft-unhide-true-parents:
git repack: keep commits hidden by a graft
Add a test showing that 'git repack' throws away grafted-away parents
Conflicts:
git-repack.sh
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 720f26b67d..8f5eaa7dd8 100644 --- a/environment.c +++ b/environment.c @@ -47,6 +47,7 @@ enum push_default_type push_default = PUSH_DEFAULT_MATCHING; #define OBJECT_CREATION_MODE OBJECT_CREATION_USES_HARDLINKS #endif enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE; +int grafts_replace_parents = 1; /* Parallel index stat data preload? */ int core_preload_index = 0; |