summaryrefslogtreecommitdiff
path: root/t/t7201-co.sh
AgeCommit message (Expand)AuthorFilesLines
2026-07-06t: convert grep assertions to test_grepMichael Montalbo1-3/+3
2026-04-29checkout -m: autostash when switching branchesHarald Nordgren1-1/+70
2024-12-15Merge branch 'bf/explicit-config-set-in-advice-messages'Junio C Hamano1-2/+2
2024-12-06advice: suggest using subcommand "git config set"Bence Ferdinandy1-2/+2
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-08-16Merge branch 'jc/checkout-no-op-switch-errors' into maint-2.46Junio C Hamano1-0/+13
2024-07-31Merge branch 'jc/checkout-no-op-switch-errors'Junio C Hamano1-0/+13
2024-07-02checkout: special case error messages during noop switchingJunio C Hamano1-0/+13
2024-06-11merge-recursive: fix leaking rename conflict infoPatrick Steinhardt1-0/+1
2024-03-14checkout: fix interaction between --conflict and --mergePhillip Wood1-0/+60
2024-03-14checkout: cleanup --conflict=<style> parsingPhillip Wood1-0/+6
2023-11-08Merge branch 'jc/test-i18ngrep'Junio C Hamano1-2/+2
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-2/+2
2023-10-02Merge branch 'jc/unresolve-removal'Junio C Hamano1-0/+47
2023-07-31checkout: allow "checkout -m path" to unmerge removed pathsJunio C Hamano1-1/+1
2023-07-31checkout/restore: add basic tests for --mergeJunio C Hamano1-0/+42
2023-07-31checkout/restore: refuse unmerging paths unless checking out of the indexJunio C Hamano1-0/+5
2023-05-23t7201-co: modernize test formatJohn Cai1-46/+46
2021-12-20branch: add flags and config to inherit trackingJosh Steadmon1-0/+17
2021-09-12tests: remove leftover untracked filesElijah Newren1-0/+1
2021-02-10Merge branch 'ab/detox-gettext-tests'Junio C Hamano1-1/+1
2021-01-21tests: remove uses of GIT_TEST_GETTEXT_POISON=falseÆvar Arnfjörð Bjarmason1-1/+1
2020-11-19t7[0-4]*: adjust the references to the default branch name "main"Johannes Schindelin1-56/+56
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-10-22t7201: put each command on a separate lineCharvi Mendiratta1-8/+18
2020-10-22t7201: use 'git -C' to avoid subshellCharvi Mendiratta1-8/+2
2020-10-22t7102,t7201: remove whitespace after redirect operatorCharvi Mendiratta1-5/+5
2020-10-20t7102,t7201: remove unnecessary blank spaces in test bodyCharvi Mendiratta1-25/+0
2020-10-20t7101,t7102,t7201: modernize test formattingCharvi Mendiratta1-16/+15
2020-07-30t7201: abstract away SHA-1-specific constantsbrian m. carlson1-2/+4
2019-06-21tests: make GIT_TEST_GETTEXT_POISON a booleanÆvar Arnfjörð Bjarmason1-1/+1
2019-03-24checkout: prevent losing staged changes with --mergeNguyễn Thái Ngọc Duy1-9/+1
2019-03-24read-tree: add --quietNguyễn Thái Ngọc Duy1-0/+3
2018-11-09i18n: make GETTEXT_POISON a runtime optionÆvar Arnfjörð Bjarmason1-3/+3
2018-10-07t/*: fix ordering of expected/observed argumentsMatthew DeVore1-2/+2
2018-08-27Merge branch 'sg/test-must-be-empty'Junio C Hamano1-4/+3
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor1-2/+1
2018-08-21tests: use 'test_must_be_empty' instead of '! test -s'SZEDER Gábor1-2/+2
2018-07-16t7000-t7999: fix broken &&-chainsEric Sunshine1-20/+20
2018-07-03t7201: drop pointless "exit 0" at end of subshellEric Sunshine1-1/+0
2018-05-23t: make many tests depend less on the refs being filesDavid Turner1-1/+1
2017-10-07tests: fix diff order arguments in test_cmpStefan Beller1-2/+2
2016-06-17i18n: advice: mark string about detached head for translationVasco Almeida1-1/+1
2015-03-20t7201: fix &&-chain breakageJeff King1-13/+6
2015-03-20t: fix &&-chaining issues around setup which might failJeff King1-1/+1
2014-08-25checkout -m: attempt merge when deletion of path was stagedJonathan Nieder1-0/+17
2013-04-21t7201.24: Add refspec to keep --track workingJohan Herland1-0/+1
2012-04-11tests: modernise style: more uses of test_line_countStefano Lattarini1-2/+2
2011-04-13i18n: use test_i18ngrep in t7201Junio C Hamano1-7/+7
2011-04-01Merge branch 'ab/i18n-st'Junio C Hamano1-5/+5
generated by cgit (git 2.54.0.dirty) at 2026-09-13 20:10:16 +0000