Merge branch 'mh/config-flip-xbit-back-after-checking' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:18:00 +0000 (12:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:18:00 +0000 (12:18 -0800)
"git init" (hence "git clone") initialized the per-repository
configuration file .git/config with x-bit by mistake.

* mh/config-flip-xbit-back-after-checking:
create_default_files(): don't set u+x bit on $GIT_DIR/config

1  2 
builtin/init-db.c
t/t0001-init.sh
Simple merge
diff --cc t/t0001-init.sh
Simple merge