summaryrefslogtreecommitdiffstats
path: root/t/t7402-submodule-rebase.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* merge-ort: turn submodule conflict suggestions into an advicePhilippe Blain2024-02-261-1/+1
* Merge branch 'ab/avoid-losing-exit-codes-in-tests'Junio C Hamano2023-03-191-6/+17
|\
| * tests: don't lose exit status with "test <op> $(git ...)"Ævar Arnfjörð Bjarmason2023-02-071-3/+6
| * tests: don't lose exit status with "(cd ...; test <op> $(git ...))"Ævar Arnfjörð Bjarmason2023-02-071-3/+11
* | sequencer API users: fix get_replay_opts() leaksÆvar Arnfjörð Bjarmason2023-02-071-0/+1
|/
* submodule merge: update conflict error messageCalvin Wan2022-08-041-2/+7
* git-am: record full index line in the patch used while rebasingJunio C Hamano2013-02-011-2/+28
* t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-131-1/+1
* Ignore dirty submodule states during rebase and stashJohannes Schindelin2008-05-161-0/+92