Merge branch 'nd/ignore-might-be-precious'
* nd/ignore-might-be-precious: checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
Junio C Hamano committed
Dec 13, 2011 at 22:55 UTC
424f30a5ae3ff26fca14df71cce31b06d1dec919
No changes.