Code

Merge branch 'nd/ignore-might-be-precious'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 06:55:07 +0000 (22:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 06:55:07 +0000 (22:55 -0800)
* nd/ignore-might-be-precious:
  checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore


No differences found