summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2021-08-15commit: restore --edit when combined with --fixupLibravatar Joel Klinghed1-1/+8
2021-08-13rebase --continue: remove .git/MERGE_MSGLibravatar Phillip Wood2-0/+18
2021-08-13rebase --apply: restore some testsLibravatar Phillip Wood2-5/+5
2021-08-13t3403: fix commit authorshipLibravatar Phillip Wood1-1/+2
2021-08-11Merge branch 'jn/log-m-does-not-imply-p'Libravatar Junio C Hamano1-2/+2
2021-08-10connect, protocol: log negotiated protocol versionLibravatar Josh Steadmon1-0/+11
2021-08-10apply: keep buffer/size pair in sync when parsing binary hunksLibravatar Jeff King1-0/+23
2021-08-09Revert 'diff-merges: let "-m" imply "-p"'Libravatar Jonathan Nieder1-2/+2
2021-08-06Merge branch 'cb/t7508-regexp-fix'Libravatar Junio C Hamano1-1/+1
2021-08-06Merge branch 'fc/disable-checkwinsize'Libravatar Junio C Hamano1-0/+6
2021-08-06test: fix for COLUMNS and bash 5Libravatar Felipe Contreras1-0/+6
2021-08-04Merge branch 'tb/mingw-rmdir-symlink-to-directory'Libravatar Junio C Hamano2-0/+16
2021-08-04Merge branch 'ab/getcwd-test'Libravatar Junio C Hamano4-1/+32
2021-08-04Merge branch 'pb/merge-autostash-more'Libravatar Junio C Hamano1-0/+19
2021-08-04Merge branch 'en/ort-perf-batch-14'Libravatar Junio C Hamano1-1/+1
2021-08-04Merge branch 'ds/commit-and-checkout-with-sparse-index'Libravatar Junio C Hamano2-23/+221
2021-08-04Merge branch 'ar/submodule-add'Libravatar Junio C Hamano2-6/+17
2021-08-02mingw: align symlinks-related rmdir() behavior with LinuxLibravatar Thomas Bétous2-0/+16
2021-08-02t7508: avoid non POSIX BRELibravatar Carlo Marcelo Arenas Belón1-1/+1
2021-08-02Merge branch 'jt/bulk-prefetch'Libravatar Junio C Hamano1-0/+33
2021-08-02Merge branch 'ab/bundle-tests'Libravatar Junio C Hamano1-16/+56
2021-08-02Merge branch 'ps/perf-with-separate-output-directory'Libravatar Junio C Hamano3-13/+24
2021-07-30t0001: fix broken not-quite getcwd(3) test in bed67874e2Libravatar Ævar Arnfjörð Bjarmason4-1/+32
2021-07-28Merge branch 'ps/t0000-output-directory-fix'Libravatar Junio C Hamano2-2/+14
2021-07-28Merge branch 'tb/reverse-midx'Libravatar Junio C Hamano1-0/+5
2021-07-28Merge branch 'pb/dont-complete-aliased-options'Libravatar Junio C Hamano1-0/+13
2021-07-28Merge branch 'ds/status-with-sparse-index'Libravatar Junio C Hamano2-11/+206
2021-07-28Merge branch 'ab/pkt-line-tests'Libravatar Junio C Hamano5-34/+24
2021-07-28Merge branch 'jk/t0000-subtests-fix'Libravatar Junio C Hamano1-10/+29
2021-07-28Merge branch 'ab/attribute-format'Libravatar Junio C Hamano1-1/+1
2021-07-28Merge branch 'jk/log-decorate-optim'Libravatar Junio C Hamano1-0/+14
2021-07-28Merge branch 'sm/worktree-add-lock'Libravatar Junio C Hamano1-1/+15
2021-07-28Merge branch 'ew/many-alternate-optim'Libravatar Junio C Hamano4-0/+100
2021-07-28Merge branch 'hj/commit-allow-empty-message'Libravatar Junio C Hamano1-1/+1
2021-07-23merge: apply autostash if merge strategy failsLibravatar Philippe Blain1-0/+8
2021-07-23merge: apply autostash if fast-forward failsLibravatar Philippe Blain1-0/+11
2021-07-23cache-tree: prefetch in partial clone read-treeLibravatar Jonathan Tan1-0/+33
2021-07-22bundle tests: use test_cmp instead of grepLibravatar Ævar Arnfjörð Bjarmason1-13/+53
2021-07-22bundle tests: use ">file" not ": >file"Libravatar Ævar Arnfjörð Bjarmason1-3/+3
2021-07-22Merge branch 'bc/rev-list-without-commit-line'Libravatar Junio C Hamano1-2/+78
2021-07-22Merge branch 'ab/send-email-optim'Libravatar Junio C Hamano1-0/+29
2021-07-22pull: fix handling of multiple headsLibravatar Elijah Newren1-1/+1
2021-07-22pull: abort by default when fast-forwarding is not possibleLibravatar Elijah Newren11-66/+66
2021-07-22pull: make --rebase and --no-rebase override pull.ff=onlyLibravatar Elijah Newren1-2/+2
2021-07-20pull: abort if --ff-only is given and fast-forwarding is impossibleLibravatar Alex Henrie1-5/+5
2021-07-20t7601: add tests of interactions with multiple merge heads and configLibravatar Elijah Newren1-0/+22
2021-07-20t7601: test interaction of merge/rebase/fast-forward flags and optionsLibravatar Elijah Newren1-0/+182
2021-07-20unpack-trees: resolve sparse-directory/file conflictsLibravatar Derrick Stolee1-12/+12
2021-07-20t1092: document bad 'git checkout' behaviorLibravatar Derrick Stolee1-2/+140
2021-07-20merge-ort: restart merge with cached renames to reduce process entry costLibravatar Elijah Newren1-1/+1