Merge branch 'sh/enable-preloadindex'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:18:49 +0000 (12:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:18:49 +0000 (12:18 -0700)
* sh/enable-preloadindex:
  environment.c: enable core.preloadindex by default

1  2 
Documentation/config.txt
environment.c

Simple merge
diff --cc environment.c
@@@ -69,10 -69,9 +69,10 @@@ unsigned long pack_size_limit_cfg
   * that is subject to stripspace.
   */
  char comment_line_char = '#';
 +int auto_comment_line_char;
  
  /* Parallel index stat data preload? */
- int core_preload_index = 0;
+ int core_preload_index = 1;
  
  /* This is set by setup_git_dir_gently() and/or git_default_config() */
  char *git_work_tree_cfg;