summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2018-08-06rerere: teach rerere to handle nested conflictsLibravatar Thomas Gummerer1-0/+37
2018-08-06rerere: fix crash with files rerere can't handleLibravatar Thomas Gummerer1-0/+21
2018-08-06t3430: demonstrate what -r, --autosquash & --exec should doLibravatar Johannes Schindelin1-0/+17
2018-08-06t4150: fix broken test for am --scissorsLibravatar Andrei Rybak1-19/+20
2018-08-06pull --rebase=<type>: allow single-letter abbreviations for the typeLibravatar Johannes Schindelin1-0/+12
2018-08-06t3031: update test description to mention desired behaviorLibravatar Elijah Newren1-1/+1
2018-08-02Merge branch 'jt/commit-graph-per-object-store'Libravatar Junio C Hamano4-0/+119
2018-08-02Merge branch 'es/chain-lint-in-subshell'Libravatar Junio C Hamano78-5/+1316
2018-08-02Merge branch 'jt/tags-to-promised-blobs-fix'Libravatar Junio C Hamano1-0/+44
2018-08-02Merge branch 'jt/fetch-negotiator-skipping'Libravatar Junio C Hamano1-0/+179
2018-08-02Merge branch 'bc/sequencer-export-work-tree-as-well'Libravatar Junio C Hamano1-0/+9
2018-08-02Merge branch 'en/t7405-recursive-submodule-conflicts'Libravatar Junio C Hamano1-0/+173
2018-08-02Merge branch 'en/t6036-merge-recursive-tests'Libravatar Junio C Hamano1-0/+451
2018-08-02Merge branch 'en/dirty-merge-fixes'Libravatar Junio C Hamano3-129/+60
2018-08-02Merge branch 'js/rebase-merge-octopus'Libravatar Junio C Hamano1-0/+34
2018-08-02Merge branch 'tb/grep-only-matching'Libravatar Junio C Hamano1-0/+15
2018-08-02Merge branch 'kg/gc-auto-windows-workaround'Libravatar Junio C Hamano1-0/+2
2018-08-02Merge branch 'jt/fetch-nego-tip'Libravatar Junio C Hamano1-0/+78
2018-08-02Merge branch 'en/t6042-insane-merge-rename-testcases'Libravatar Junio C Hamano1-0/+245
2018-08-02Merge branch 'is/parsing-line-range'Libravatar Junio C Hamano3-9/+12
2018-08-02Merge branch 'jt/fetch-pack-negotiator'Libravatar Junio C Hamano1-0/+33
2018-08-02Merge branch 'ab/checkout-default-remote'Libravatar Junio C Hamano2-0/+80
2018-08-02Merge branch 'sb/diff-color-move-more'Libravatar Junio C Hamano1-33/+210
2018-08-02Merge branch 'es/test-fixes'Libravatar Junio C Hamano104-590/+569
2018-08-02Merge branch 'ds/commit-graph-fsck'Libravatar Junio C Hamano1-2/+203
2018-08-02Merge branch 'jk/fsck-gitmodules-gently'Libravatar Junio C Hamano1-0/+15
2018-08-02Merge branch 'en/t6036-recursive-corner-cases'Libravatar Junio C Hamano1-55/+201
2018-08-02Merge branch 'sg/httpd-test-unflake'Libravatar Junio C Hamano4-36/+29
2018-08-02Merge branch 'bp/test-drop-caches-for-windows'Libravatar Junio C Hamano1-2/+2
2018-08-02Merge branch 'jk/has-uncommitted-changes-fix'Libravatar Junio C Hamano1-0/+12
2018-08-02score_trees(): fix iteration over trees with missing entriesLibravatar Jeff King1-0/+28
2018-08-02remote: make refspec follow the same disambiguation rule as local refsLibravatar Junio C Hamano1-0/+35
2018-08-01fetch-pack: unify ref in and out paramLibravatar Jonathan Tan1-0/+18
2018-08-01git-p4: add the `p4-pre-submit` hookLibravatar Chen Bin1-0/+29
2018-08-01t1300: document current behavior of setting optionsLibravatar Stefan Beller1-0/+86
2018-08-01negotiator: unknown fetch.negotiationAlgorithm should error outLibravatar Ævar Arnfjörð Bjarmason1-0/+23
2018-08-01Merge branch 'jt/fetch-nego-tip' into ab/fetch-negoLibravatar Junio C Hamano1-0/+78
2018-08-01t1404: increase core.packedRefsTimeout to avoid occasional test failureLibravatar SZEDER Gábor1-3/+3
2018-07-31read-cache: fix directory/file conflict handling in read_index_unmerged()Libravatar Elijah Newren3-9/+4
2018-07-31t1015: demonstrate directory/file conflict recovery failuresLibravatar Elijah Newren1-0/+123
2018-07-31sequencer: fix "rebase -i --root" corrupting author header timestampLibravatar Eric Sunshine1-1/+1
2018-07-31sequencer: fix "rebase -i --root" corrupting author header timezoneLibravatar Eric Sunshine1-1/+1
2018-07-31sequencer: fix "rebase -i --root" corrupting author headerLibravatar Eric Sunshine1-1/+9
2018-07-31t/chainlint.sed: drop extra spaces from regex character classLibravatar Eric Sunshine1-4/+4
2018-07-31push tests: assert re-pushing annotated tagsLibravatar Ævar Arnfjörð Bjarmason1-37/+45
2018-07-31push tests: add more testing for forced tag pushingLibravatar Ævar Arnfjörð Bjarmason1-2/+20
2018-07-31push tests: fix logic error in "push" test assertionLibravatar Ævar Arnfjörð Bjarmason1-2/+2
2018-07-31push tests: remove redundant 'git push' invocationLibravatar Ævar Arnfjörð Bjarmason1-1/+0
2018-07-31fetch tests: change "Tag" test tag to "testTag"Libravatar Ævar Arnfjörð Bjarmason1-9/+9
2018-07-30t5562: avoid non-portable "export FOO=bar" constructLibravatar Ramsay Jones1-1/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 16:02:44 +0000