tree c4eb6651858eebdb79be5c6f614f13cca9b09786
parent c42e0b64093306d59372df288f9b4086290623f5
author Elijah Newren <newren@gmail.com> 1632760423 +0000
committer Junio C Hamano <gitster@pobox.com> 1632775117 -0700

Remove ignored files by default when they are in the way

Change several commands to remove ignored files by default when they are
in the way.  Since some commands (checkout, merge) take a
--no-overwrite-ignore option to allow the user to configure this, and it
may make sense to add that option to more commands (and in the case of
merge, actually plumb that configuration option through to more of the
backends than just the fast-forwarding special case), add little
comments about where such flags would be used.

Incidentally, this fixes a test failure in t7112.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>