1
0
mirror of https://github.com/git/git.git synced 2024-09-24 09:01:47 +02:00
git/builtin
Elijah Newren 1b5f37334a 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>
2021-09-27 13:38:37 -07:00
..
add.c Merge branch 'ab/retire-advice-config' 2021-09-10 11:46:29 -07:00
am.c Remove ignored files by default when they are in the way 2021-09-27 13:38:37 -07:00
annotate.c
apply.c
archive.c
bisect--helper.c
blame.c
branch.c branch: allow deleting dangling branches with --force 2021-08-27 15:11:18 -07:00
bugreport.c
bundle.c
cat-file.c
check-attr.c
check-ignore.c
check-mailmap.c
check-ref-format.c
checkout--worker.c
checkout-index.c
checkout.c unpack-trees: introduce preserve_ignored to unpack_trees_options 2021-09-27 13:38:37 -07:00
clean.c
clone.c Remove ignored files by default when they are in the way 2021-09-27 13:38:37 -07:00
column.c
commit-graph.c commit-graph: show "unexpected subcommand" error 2021-08-30 17:06:18 -07:00
commit-tree.c
commit.c Merge branch 'ab/retire-advice-config' 2021-09-10 11:46:29 -07:00
config.c
count-objects.c
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
describe.c
diff-files.c
diff-index.c diff-index: restore -c/--cc options handling 2021-09-07 11:11:35 -07:00
diff-tree.c
diff.c
difftool.c
env--helper.c
fast-export.c Merge branch 'tk/fast-export-anonymized-tag-fix' 2021-09-10 11:46:27 -07:00
fast-import.c
fetch-pack.c
fetch.c Merge branch 'ab/retire-advice-config' 2021-09-10 11:46:29 -07:00
fmt-merge-msg.c
for-each-ref.c
for-each-repo.c
fsck.c
gc.c Merge branch 'ab/gc-log-rephrase' 2021-09-10 11:46:28 -07:00
get-tar-commit-id.c
grep.c
hash-object.c Merge branch 'jc/prefix-filename-allocates' 2021-09-15 13:15:28 -07:00
help.c
index-pack.c
init-db.c
interpret-trailers.c
log.c
ls-files.c
ls-remote.c
ls-tree.c
mailinfo.c
mailsplit.c
merge-base.c
merge-file.c
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c
merge.c Remove ignored files by default when they are in the way 2021-09-27 13:38:37 -07:00
mktag.c
mktree.c
multi-pack-index.c multi-pack-index: refactor "goto usage" pattern 2021-08-30 17:06:18 -07:00
mv.c
name-rev.c
notes.c
pack-objects.c builtin/pack-objects.c: remove duplicate hash lookup 2021-08-29 23:25:43 -07:00
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c
prune.c
pull.c
push.c
range-diff.c
read-tree.c unpack-trees: introduce preserve_ignored to unpack_trees_options 2021-09-27 13:38:37 -07:00
rebase.c Merge branch 'js/advise-when-skipping-cherry-picked' 2021-09-10 11:46:19 -07:00
receive-pack.c
reflog.c
remote-ext.c
remote-fd.c
remote.c
repack.c
replace.c
rerere.c
reset.c Remove ignored files by default when they are in the way 2021-09-27 13:38:37 -07:00
rev-list.c
rev-parse.c
revert.c
rm.c
send-pack.c
shortlog.c
show-branch.c show-branch: simplify rev_is_head() 2021-08-27 14:12:15 -07:00
show-index.c
show-ref.c
sparse-checkout.c
stash.c Remove ignored files by default when they are in the way 2021-09-27 13:38:37 -07:00
stripspace.c
submodule--helper.c
symbolic-ref.c
tag.c Merge branch 'rs/xopen-reports-open-failures' 2021-09-08 13:30:32 -07:00
unpack-file.c
unpack-objects.c
update-index.c
update-ref.c
update-server-info.c
upload-archive.c
upload-pack.c
var.c
verify-commit.c
verify-pack.c
verify-tag.c
worktree.c
write-tree.c