From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Dec 2011 06:55:07 +0000 (-0800)
Subject: Merge branch 'nd/ignore-might-be-precious'
X-Git-Tag: v1.7.9-rc0~68
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=424f30a5ae3ff26fca14df71cce31b06d1dec919;p=git.git

Merge branch 'nd/ignore-might-be-precious'

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

424f30a5ae3ff26fca14df71cce31b06d1dec919