summaryrefslogtreecommitdiff
path: root/t/t7201-co.sh
AgeCommit message (Expand)Author
2019-06-21tests: make GIT_TEST_GETTEXT_POISON a booleanÆvar Arnfjörð Bjarmason
2019-03-24checkout: prevent losing staged changes with --mergeNguyễn Thái Ngọc Duy
2019-03-24read-tree: add --quietNguyễn Thái Ngọc Duy
2018-11-09i18n: make GETTEXT_POISON a runtime optionÆvar Arnfjörð Bjarmason
2018-10-06t/*: fix ordering of expected/observed argumentsMatthew DeVore
2018-08-27Merge branch 'sg/test-must-be-empty'Junio C Hamano
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor
2018-08-21tests: use 'test_must_be_empty' instead of '! test -s'SZEDER Gábor
2018-07-16t7000-t7999: fix broken &&-chainsEric Sunshine
2018-07-03t7201: drop pointless "exit 0" at end of subshellEric Sunshine
2018-05-23t: make many tests depend less on the refs being filesDavid Turner
2017-10-07tests: fix diff order arguments in test_cmpStefan Beller
2016-06-17i18n: advice: mark string about detached head for translationVasco Almeida
2015-03-20t7201: fix &&-chain breakageJeff King
2015-03-20t: fix &&-chaining issues around setup which might failJeff King
2014-08-25checkout -m: attempt merge when deletion of path was stagedJonathan Nieder
2013-04-21t7201.24: Add refspec to keep --track workingJohan Herland
2012-04-11tests: modernise style: more uses of test_line_countStefano Lattarini
2011-04-13i18n: use test_i18ngrep in t7201Junio C Hamano
2011-04-02Merge branch 'ab/i18n-st'Junio C Hamano
2011-03-10i18n: git-checkout "HEAD is now at" messageÆvar Arnfjörð Bjarmason
2011-02-17branch/checkout --track: Ensure that upstream branch is indeed a branchJohan Herland
2010-03-21checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder
2010-03-21checkout --conflict=diff3: add a label for ancestorJonathan Nieder
2010-03-21tests: document format of conflicts from checkout -mJonathan Nieder
2010-01-30Reword "detached HEAD" notificationJunio C Hamano
2010-01-17Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Junio C Hamano
2010-01-06checkout -m path: fix recreating conflictsJunio C Hamano
2009-05-17test: checkout shouldn't say that HEAD has moved if it didn'tNanako Shiraishi
2009-04-08Change double quotes to single quotes in messageJari Aalto
2008-10-22Merge branch 'jc/maint-co-track'Junio C Hamano
2008-10-19Enhance hold_lock_file_for_{update,append}() APIJunio C Hamano
2008-10-19demonstrate breakage of detached checkout with symbolic link HEADJunio C Hamano
2008-10-17Fix "checkout --track -b newbranch" on detached HEADJunio C Hamano
2008-09-29Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce
2008-09-22Merge branch 'db/maint-checkout-b'Junio C Hamano
2008-09-22Check early that a new branch is new and validDaniel Barkalow
2008-09-10Merge branch 'jc/maint-checkout-fix' into maintJunio C Hamano
2008-09-08Merge branch 'jc/maint-checkout-fix'Junio C Hamano
2008-09-03Merge branch 'maint'Junio C Hamano
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi
2008-09-01checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano
2008-08-31checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano
2008-08-31checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano
2008-08-31checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano
2008-08-30checkout: do not check out unmerged higher stages randomlyJunio C Hamano
2008-08-23Extend "checkout --track" DWIM to support more casesAlex Riesen
2008-08-11checkout --track: make up a sensible branch name if '-b' was omittedJohannes Schindelin
2008-07-23t3200,t7201: replace '!' with test_must_failBrandon Casey
2008-03-13add test_cmp function for test scriptsJeff King