aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7402-submodule-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
2024-02-26merge-ort: turn submodule conflict suggestions into an advicePhilippe Blain1-1/+1
2023-03-19Merge branch 'ab/avoid-losing-exit-codes-in-tests'Junio C Hamano1-6/+17
2023-02-06sequencer API users: fix get_replay_opts() leaksÆvar Arnfjörð Bjarmason1-0/+1
2023-02-06tests: don't lose exit status with "test <op> $(git ...)"Ævar Arnfjörð Bjarmason1-3/+6
2023-02-06tests: don't lose exit status with "(cd ...; test <op> $(git ...))"Ævar Arnfjörð Bjarmason1-3/+11
2022-08-04submodule merge: update conflict error messageCalvin Wan1-2/+7
2013-01-31git-am: record full index line in the patch used while rebasingJunio C Hamano1-2/+28
2008-07-13t/: Use "test_must_fail git" instead of "! git"Stephan Beyer1-1/+1
2008-05-15Ignore dirty submodule states during rebase and stashJohannes Schindelin1-0/+92