Merge branch 'lt/config-fsync'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2008 20:19:49 +0000 (13:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2008 20:19:49 +0000 (13:19 -0700)
* lt/config-fsync:
  Add config option to enable 'fsync()' of object files
  Split up default "i18n" and "branch" config parsing into helper routines
  Split up default "user" config parsing into helper routine
  Split up default "core" config parsing into helper routine

1  2 
Documentation/config.txt
cache.h
config.c
environment.c
sha1_file.c

Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge
diff --cc environment.c
Simple merge
diff --cc sha1_file.c
Simple merge