summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-09-27unpack-trees: avoid nuking untracked dir in way of locally deleted fileLibravatar Elijah Newren2-1/+4
2021-09-27unpack-trees: avoid nuking untracked dir in way of unmerged fileLibravatar Elijah Newren2-5/+32
2021-09-27Change unpack_trees' 'reset' flag into an enumLibravatar Elijah Newren9-16/+39
2021-09-27Remove ignored files by default when they are in the wayLibravatar Elijah Newren9-16/+8
2021-09-27unpack-trees: make dir an internal-only structLibravatar Elijah Newren2-3/+6
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsLibravatar Elijah Newren14-40/+35
2021-09-27read-tree, merge-recursive: overwrite ignored files by defaultLibravatar Elijah Newren4-34/+21
2021-09-27checkout, read-tree: fix leak of unpack_trees_options.dirLibravatar Elijah Newren2-0/+9
2021-09-24t2500: add various tests for nuking untracked filesLibravatar Elijah Newren1-0/+244
2021-09-20Merge branch 'en/am-abort-fix' into en/removing-untracked-fixesLibravatar Junio C Hamano3-1/+43
2021-09-15The sixth batchLibravatar Junio C Hamano1-0/+30
2021-09-15Merge branch 'jc/prefix-filename-allocates'Libravatar Junio C Hamano1-1/+1
2021-09-15Merge branch 'rs/range-diff-avoid-segfault-with-I'Libravatar Junio C Hamano1-0/+3
2021-09-15Merge branch 'ab/reverse-midx-optim'Libravatar Junio C Hamano1-0/+3
2021-09-15Merge branch 'bs/install-strip'Libravatar Junio C Hamano1-3/+12
2021-09-15Merge branch 'pb/test-use-user-env'Libravatar Junio C Hamano3-21/+103
2021-09-15Merge branch 'jc/trivial-threeway-binary-merge'Libravatar Junio C Hamano2-0/+66
2021-09-15Merge branch 'bs/doc-bugreport-outdir'Libravatar Junio C Hamano1-2/+2
2021-09-15Merge branch 'ab/no-more-check-bindir'Libravatar Junio C Hamano2-15/+1
2021-09-15Merge branch 'ab/send-email-config-fix'Libravatar Junio C Hamano2-1/+16
2021-09-15Merge branch 'so/diff-index-regression-fix'Libravatar Junio C Hamano3-14/+8
2021-09-10am: fix incorrect exit status on am fail to abortLibravatar Elijah Newren2-2/+3
2021-09-10t4151: add a few am --abort testsLibravatar Elijah Newren1-0/+39
2021-09-10git-am.txt: clarify --abort behaviorLibravatar Elijah Newren1-0/+2
2021-09-10The fifth batchLibravatar Junio C Hamano1-0/+61
2021-09-10Merge branch 'ab/help-autocorrect-prompt'Libravatar Junio C Hamano2-8/+29
2021-09-10Merge branch 'cb/ci-build-pedantic'Libravatar Junio C Hamano3-3/+13
2021-09-10Merge branch 'gh/gitweb-branch-sort'Libravatar Junio C Hamano1-1/+2
2021-09-10Merge branch 'rs/archive-use-object-id'Libravatar Junio C Hamano1-4/+3
2021-09-10Merge branch 'rs/show-branch-simplify'Libravatar Junio C Hamano1-10/+5
2021-09-10Merge branch 'jk/log-warn-on-bogus-encoding'Libravatar Junio C Hamano4-4/+17
2021-09-10Merge branch 'cb/remote-ndebug-fix'Libravatar Junio C Hamano1-3/+3
2021-09-10Merge branch 'ab/retire-advice-config'Libravatar Junio C Hamano25-166/+63
2021-09-10Merge branch 'mk/clone-recurse-submodules'Libravatar Junio C Hamano2-0/+17
2021-09-10Merge branch 'ab/mailmap-leakfix'Libravatar Junio C Hamano1-0/+2
2021-09-10Merge branch 'ab/gc-log-rephrase'Libravatar Junio C Hamano1-1/+1
2021-09-10Merge branch 'uk/userdiff-php-enum'Libravatar Junio C Hamano2-1/+5
2021-09-10Merge branch 'tk/fast-export-anonymized-tag-fix'Libravatar Junio C Hamano2-4/+7
2021-09-10Merge branch 'ba/object-info'Libravatar Junio C Hamano1-2/+3
2021-09-10Merge branch 'ab/commit-graph-usage'Libravatar Junio C Hamano3-46/+74
2021-09-10Merge branch 'mh/send-email-reset-in-reply-to'Libravatar Junio C Hamano2-9/+62
2021-09-10Merge branch 'rs/more-fspathcmp'Libravatar Junio C Hamano1-4/+1
2021-09-10Merge branch 'sg/set-ceiling-during-tests'Libravatar Junio C Hamano1-1/+2
2021-09-10Merge branch 'jh/sparse-index-resize-fix'Libravatar Junio C Hamano1-0/+1
2021-09-10Merge branch 'es/walken-tutorial-fix'Libravatar Junio C Hamano1-2/+2
2021-09-10Merge branch 'tb/add-objects-in-unpacked-packs-simplify'Libravatar Junio C Hamano4-74/+24
2021-09-10Merge branch 'ps/fetch-omit-formatting-under-quiet'Libravatar Junio C Hamano1-5/+12
2021-09-10Merge branch 'ka/want-ref-in-namespace'Libravatar Junio C Hamano3-48/+192
2021-09-10Merge branch 'zh/cherry-pick-advice'Libravatar Junio C Hamano3-11/+42
2021-09-10Merge branch 'js/advise-when-skipping-cherry-picked'Libravatar Junio C Hamano7-6/+38