summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2020-03-02Merge branch 'en/t3433-rebase-stat-dirty-failure'Libravatar Junio C Hamano1-0/+48
2020-03-02Merge branch 'en/rebase-backend'Libravatar Junio C Hamano17-133/+304
2020-03-02Merge branch 'en/check-ignore'Libravatar Junio C Hamano1-16/+23
2020-03-02Merge branch 'jk/object-filter-with-bitmap'Libravatar Junio C Hamano5-7/+146
2020-02-25Merge branch 'es/bright-colors'Libravatar Junio C Hamano1-0/+12
2020-02-25Merge branch 'bw/remote-rename-update-config'Libravatar Junio C Hamano3-3/+100
2020-02-19merge-recursive: fix the refresh logic in update_file_flagsLibravatar Elijah Newren1-1/+1
2020-02-19t3433: new rebase testcase documenting a stat-dirty-like failureLibravatar Elijah Newren1-0/+48
2020-02-18check-ignore: fix documentation and implementation to matchLibravatar Elijah Newren1-16/+23
2020-02-17Merge branch 'js/test-unc-fetch'Libravatar Junio C Hamano1-0/+12
2020-02-17Merge branch 'js/test-avoid-pipe'Libravatar Junio C Hamano2-6/+10
2020-02-17Merge branch 'js/test-write-junit-xml-fix'Libravatar Junio C Hamano1-1/+2
2020-02-17Merge branch 'jk/mailinfo-cleanup'Libravatar Junio C Hamano1-0/+15
2020-02-17Merge branch 'mr/show-config-scope'Libravatar Junio C Hamano3-106/+155
2020-02-17Merge branch 'bc/hash-independent-tests-part-8'Libravatar Junio C Hamano46-279/+1817
2020-02-16rebase: rename the two primary rebase backendsLibravatar Elijah Newren15-75/+75
2020-02-16rebase: change the default backend from "am" to "merge"Libravatar Elijah Newren2-5/+8
2020-02-16rebase tests: repeat some tests using the merge backend instead of amLibravatar Elijah Newren2-4/+26
2020-02-16rebase tests: mark tests specific to the am-backend with --amLibravatar Elijah Newren11-53/+53
2020-02-16rebase: drop '-i' from the reflog for interactive-based rebasesLibravatar Elijah Newren1-5/+5
2020-02-16git-prompt: change the prompt for interactive-based rebasesLibravatar Elijah Newren1-4/+4
2020-02-16rebase: allow more types of rebases to fast-forwardLibravatar Elijah Newren1-0/+2
2020-02-16t3432: make these tests work with either am or merge backendsLibravatar Elijah Newren1-26/+22
2020-02-16rebase: fix handling of restrict_revisionLibravatar Elijah Newren1-1/+19
2020-02-16rebase: make sure to pass along the quiet flag to the sequencerLibravatar Elijah Newren1-1/+7
2020-02-16t3406: simplify an already simple testLibravatar Elijah Newren1-5/+2
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyLibravatar Elijah Newren2-9/+65
2020-02-16rebase (interactive-backend): make --keep-empty the defaultLibravatar Elijah Newren3-14/+84
2020-02-14Merge branch 'tb/commit-graph-object-dir'Libravatar Junio C Hamano2-6/+6
2020-02-14Merge branch 'jk/index-pack-dupfix'Libravatar Junio C Hamano1-4/+4
2020-02-14Merge branch 'jh/notes-fanout-fix'Libravatar Junio C Hamano1-25/+82
2020-02-14Merge branch 'pk/status-of-uncloned-submodule'Libravatar Junio C Hamano1-0/+23
2020-02-14Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'Libravatar Junio C Hamano1-0/+13
2020-02-14Merge branch 'ds/sparse-checkout-harden'Libravatar Junio C Hamano1-141/+211
2020-02-14Merge branch 'jk/get-oid-error-message-i18n'Libravatar Junio C Hamano2-36/+48
2020-02-14Merge branch 'ag/edit-todo-drop-check'Libravatar Junio C Hamano1-0/+121
2020-02-14Merge branch 'dl/test-must-fail-fixes-2'Libravatar Junio C Hamano8-95/+204
2020-02-14Merge branch 'js/rebase-i-with-colliding-hash'Libravatar Junio C Hamano1-2/+15
2020-02-14Merge branch 'kw/fsmonitor-watchman-racefix'Libravatar Junio C Hamano6-5/+202
2020-02-14Merge branch 'jn/promote-proto2-to-default'Libravatar Junio C Hamano12-34/+45
2020-02-14Merge branch 'hw/advice-add-nothing'Libravatar Junio C Hamano2-2/+6
2020-02-14Merge branch 'jb/parse-options-message-fix' into maintLibravatar Junio C Hamano1-2/+2
2020-02-14Merge branch 'pb/do-not-recurse-grep-no-index' into maintLibravatar Junio C Hamano1-1/+10
2020-02-14Merge branch 'jt/t5616-robustify' into maintLibravatar Junio C Hamano1-13/+23
2020-02-14Merge branch 'en/fill-directory-fixes-more' into maintLibravatar Junio C Hamano1-0/+9
2020-02-14Merge branch 'ds/refmap-doc' into maintLibravatar Junio C Hamano1-0/+24
2020-02-14Merge branch 'jk/test-fixes' into maintLibravatar Junio C Hamano2-4/+2
2020-02-14Merge branch 'nd/switch-and-restore' into maintLibravatar Junio C Hamano1-0/+17
2020-02-14Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maintLibravatar Junio C Hamano1-0/+12
2020-02-14Merge branch 'hw/commit-advise-while-rejecting' into maintLibravatar Junio C Hamano1-0/+9