summaryrefslogtreecommitdiffstats
path: root/t/t7201-co.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt2024-11-211-1/+0
* Merge branch 'jc/checkout-no-op-switch-errors'Junio C Hamano2024-07-311-0/+13
|\
| * checkout: special case error messages during noop switchingJunio C Hamano2024-07-021-0/+13
* | merge-recursive: fix leaking rename conflict infoPatrick Steinhardt2024-06-111-0/+1
* | checkout: fix interaction between --conflict and --mergePhillip Wood2024-03-141-0/+60
* | checkout: cleanup --conflict=<style> parsingPhillip Wood2024-03-141-0/+6
|/
* Merge branch 'jc/test-i18ngrep'Junio C Hamano2023-11-081-2/+2
|\
| * tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano2023-11-021-2/+2
* | Merge branch 'jc/unresolve-removal'Junio C Hamano2023-10-021-0/+47
|\ \ | |/ |/|
| * checkout: allow "checkout -m path" to unmerge removed pathsJunio C Hamano2023-08-011-1/+1
| * checkout/restore: add basic tests for --mergeJunio C Hamano2023-08-011-0/+42
| * checkout/restore: refuse unmerging paths unless checking out of the indexJunio C Hamano2023-08-011-0/+5
* | t7201-co: modernize test formatJohn Cai2023-05-231-46/+46
|/
* branch: add flags and config to inherit trackingJosh Steadmon2021-12-211-0/+17
* tests: remove leftover untracked filesElijah Newren2021-09-131-0/+1
* Merge branch 'ab/detox-gettext-tests'Junio C Hamano2021-02-101-1/+1
|\
| * tests: remove uses of GIT_TEST_GETTEXT_POISON=falseÆvar Arnfjörð Bjarmason2021-01-221-1/+1
* | t7[0-4]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-201-56/+56
* | tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-201-0/+3
|/
* t7201: put each command on a separate lineCharvi Mendiratta2020-10-221-8/+18
* t7201: use 'git -C' to avoid subshellCharvi Mendiratta2020-10-221-8/+2
* t7102,t7201: remove whitespace after redirect operatorCharvi Mendiratta2020-10-221-5/+5
* t7102,t7201: remove unnecessary blank spaces in test bodyCharvi Mendiratta2020-10-201-25/+0
* t7101,t7102,t7201: modernize test formattingCharvi Mendiratta2020-10-201-16/+15
* t7201: abstract away SHA-1-specific constantsbrian m. carlson2020-07-301-2/+4
* tests: make GIT_TEST_GETTEXT_POISON a booleanÆvar Arnfjörð Bjarmason2019-06-211-1/+1
* checkout: prevent losing staged changes with --mergeNguyễn Thái Ngọc Duy2019-03-241-9/+1
* read-tree: add --quietNguyễn Thái Ngọc Duy2019-03-241-0/+3
* i18n: make GETTEXT_POISON a runtime optionÆvar Arnfjörð Bjarmason2018-11-091-3/+3
* t/*: fix ordering of expected/observed argumentsMatthew DeVore2018-10-071-2/+2
* Merge branch 'sg/test-must-be-empty'Junio C Hamano2018-08-271-4/+3
|\
| * tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor2018-08-211-2/+1
| * tests: use 'test_must_be_empty' instead of '! test -s'SZEDER Gábor2018-08-211-2/+2
* | t7000-t7999: fix broken &&-chainsEric Sunshine2018-07-161-20/+20
* | t7201: drop pointless "exit 0" at end of subshellEric Sunshine2018-07-031-1/+0
|/
* t: make many tests depend less on the refs being filesDavid Turner2018-05-231-1/+1
* tests: fix diff order arguments in test_cmpStefan Beller2017-10-071-2/+2
* i18n: advice: mark string about detached head for translationVasco Almeida2016-06-181-1/+1
* t7201: fix &&-chain breakageJeff King2015-03-201-13/+6
* t: fix &&-chaining issues around setup which might failJeff King2015-03-201-1/+1
* checkout -m: attempt merge when deletion of path was stagedJonathan Nieder2014-08-261-0/+17
* t7201.24: Add refspec to keep --track workingJohan Herland2013-04-221-0/+1
* tests: modernise style: more uses of test_line_countStefano Lattarini2012-04-111-2/+2
* i18n: use test_i18ngrep in t7201Junio C Hamano2011-04-141-7/+7
* Merge branch 'ab/i18n-st'Junio C Hamano2011-04-021-5/+5
|\
| * i18n: git-checkout "HEAD is now at" messageÆvar Arnfjörð Bjarmason2011-03-101-5/+5
* | branch/checkout --track: Ensure that upstream branch is indeed a branchJohan Herland2011-02-171-7/+9
|/
* checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-211-1/+1
* checkout --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-211-2/+2
* tests: document format of conflicts from checkout -mJonathan Nieder2010-03-211-4/+61
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 14:14:01 +0100