summaryrefslogtreecommitdiff
path: root/t/t7201-co.sh
AgeCommit message (Expand)AuthorFilesLines
2018-10-07t/*: fix ordering of expected/observed argumentsLibravatar Matthew DeVore1-2/+2
2018-08-27Merge branch 'sg/test-must-be-empty'Libravatar Junio C Hamano1-4/+3
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'Libravatar SZEDER Gábor1-2/+1
2018-08-21tests: use 'test_must_be_empty' instead of '! test -s'Libravatar SZEDER Gábor1-2/+2
2018-07-16t7000-t7999: fix broken &&-chainsLibravatar Eric Sunshine1-20/+20
2018-07-03t7201: drop pointless "exit 0" at end of subshellLibravatar Eric Sunshine1-1/+0
2018-05-23t: make many tests depend less on the refs being filesLibravatar David Turner1-1/+1
2017-10-07tests: fix diff order arguments in test_cmpLibravatar Stefan Beller1-2/+2
2016-06-17i18n: advice: mark string about detached head for translationLibravatar Vasco Almeida1-1/+1
2015-03-20t7201: fix &&-chain breakageLibravatar Jeff King1-13/+6
2015-03-20t: fix &&-chaining issues around setup which might failLibravatar Jeff King1-1/+1
2014-08-25checkout -m: attempt merge when deletion of path was stagedLibravatar Jonathan Nieder1-0/+17
2013-04-21t7201.24: Add refspec to keep --track workingLibravatar Johan Herland1-0/+1
2012-04-11tests: modernise style: more uses of test_line_countLibravatar Stefano Lattarini1-2/+2
2011-04-13i18n: use test_i18ngrep in t7201Libravatar Junio C Hamano1-7/+7
2011-04-01Merge branch 'ab/i18n-st'Libravatar Junio C Hamano1-5/+5
2011-03-09i18n: git-checkout "HEAD is now at" messageLibravatar Ævar Arnfjörð Bjarmason1-5/+5
2011-02-16branch/checkout --track: Ensure that upstream branch is indeed a branchLibravatar Johan Herland1-7/+9
2010-03-20checkout -m --conflict=diff3: add a label for ancestorLibravatar Jonathan Nieder1-1/+1
2010-03-20checkout --conflict=diff3: add a label for ancestorLibravatar Jonathan Nieder1-2/+2
2010-03-20tests: document format of conflicts from checkout -mLibravatar Jonathan Nieder1-4/+61
2010-01-29Reword "detached HEAD" notificationLibravatar Junio C Hamano1-10/+22
2010-01-17Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Libravatar Junio C Hamano1-0/+57
2010-01-06checkout -m path: fix recreating conflictsLibravatar Junio C Hamano1-0/+57
2009-05-16test: checkout shouldn't say that HEAD has moved if it didn'tLibravatar Nanako Shiraishi1-0/+8
2009-04-07Change double quotes to single quotes in messageLibravatar Jari Aalto1-1/+1
2008-10-21Merge branch 'jc/maint-co-track'Libravatar Junio C Hamano1-6/+20
2008-10-19Enhance hold_lock_file_for_{update,append}() APILibravatar Junio C Hamano1-1/+1
2008-10-19demonstrate breakage of detached checkout with symbolic link HEADLibravatar Junio C Hamano1-0/+12
2008-10-17Fix "checkout --track -b newbranch" on detached HEADLibravatar Junio C Hamano1-6/+8
2008-09-29Merge branch 'jc/better-conflict-resolution'Libravatar Shawn O. Pearce1-2/+121
2008-09-21Merge branch 'db/maint-checkout-b'Libravatar Junio C Hamano1-0/+10
2008-09-21Check early that a new branch is new and validLibravatar Daniel Barkalow1-0/+10
2008-09-10Merge branch 'jc/maint-checkout-fix' into maintLibravatar Junio C Hamano1-0/+22
2008-09-07Merge branch 'jc/maint-checkout-fix'Libravatar Junio C Hamano1-0/+22
2008-09-03Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Libravatar Nanako Shiraishi1-1/+1
2008-08-31checkout --conflict=<style>: recreate merge in a non-default styleLibravatar Junio C Hamano1-46/+54
2008-08-30checkout -m: recreate merge when checking out of unmerged indexLibravatar Junio C Hamano1-0/+63
2008-08-30checkout --ours/--theirs: allow checking out one side of a conflicting mergeLibravatar Junio C Hamano1-0/+25
2008-08-30checkout -f: allow ignoring unmerged paths when checking out of the indexLibravatar Junio C Hamano1-0/+23
2008-08-30checkout: do not check out unmerged higher stages randomlyLibravatar Junio C Hamano1-0/+22
2008-08-22Extend "checkout --track" DWIM to support more casesLibravatar Alex Riesen1-1/+22
2008-08-11checkout --track: make up a sensible branch name if '-b' was omittedLibravatar Johannes Schindelin1-0/+11
2008-07-23t3200,t7201: replace '!' with test_must_failLibravatar Brandon Casey1-1/+1
2008-03-13add test_cmp function for test scriptsLibravatar Jeff King1-9/+9
2008-02-27Merge branch 'js/branch-track'Libravatar Junio C Hamano1-0/+24
2008-02-27Merge branch 'db/checkout'Libravatar Junio C Hamano1-16/+43
2008-02-20checkout: work from a subdirectoryLibravatar Junio C Hamano1-0/+34
2008-02-19branch: optionally setup branch.*.merge from upstream local branchesLibravatar Jay Soffian1-0/+24
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 17:53:12 +0000