]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/windows-dotgit' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2016 20:17:23 +0000 (13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2016 20:17:23 +0000 (13:17 -0700)
On Windows, .git and optionally any files whose name starts with a
dot are now marked as hidden, with a core.hideDotFiles knob to
customize this behaviour.

* js/windows-dotgit:
  mingw: remove unnecessary definition
  mingw: introduce the 'core.hideDotFiles' setting

1  2 
Documentation/config.txt
cache.h
compat/mingw.c
compat/mingw.h
config.c
environment.c
t/t5611-clone-config.sh

Simple merge
diff --cc cache.h
Simple merge
diff --cc compat/mingw.c
Simple merge
diff --cc compat/mingw.h
Simple merge
diff --cc config.c
Simple merge
diff --cc environment.c
index 57acb2fe2aee79a30c4c956dcececd6a7122aeb6,646f384aa99d1914a6a4fca417b65ca340f9a9ee..96160a75a53340fcc9b2e1a81d2198d073bd4562
@@@ -62,7 -64,9 +62,8 @@@ int grafts_replace_parents = 1
  int core_apply_sparse_checkout;
  int merge_log_config = -1;
  int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
 -struct startup_info *startup_info;
  unsigned long pack_size_limit_cfg;
+ enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
  
  #ifndef PROTECT_HFS_DEFAULT
  #define PROTECT_HFS_DEFAULT 0
Simple merge