Andrew's git / gitweb.git / diff
?
Merge branch 'ew/config-protect-mode'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:46 +0000 (12:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:46 +0000 (12:06 -0700)
* ew/config-protect-mode:
config: preserve config file permissions on edits

1  2 
config.c patch | diff1 | diff2 | blob | history
t/t1300-repo-config.sh patch | diff1 | diff2 | blob | history
diff --cc config.c
Simple merge
diff --cc t/t1300-repo-config.sh
Simple merge