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)
commit424f30a5ae3ff26fca14df71cce31b06d1dec919
treed4c464ab476a9847fe5f70a747864a0e386020b0
parentb2dd02112052aff875e8dc7d12b9915c91feafe2
parentc1d7036b6bfea586a30c6eac672e58e22e5ceaf5
Merge branch 'nd/ignore-might-be-precious'

* nd/ignore-might-be-precious:
  checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
builtin/checkout.c
builtin/merge.c