summaryrefslogtreecommitdiff
path: root/t/t7201-co.sh
AgeCommit message (Expand)Author
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
2008-02-27Merge branch 'js/branch-track'Junio C Hamano
2008-02-27Merge branch 'db/checkout'Junio C Hamano
2008-02-21checkout: work from a subdirectoryJunio C Hamano
2008-02-20branch: optionally setup branch.*.merge from upstream local branchesJay Soffian
2008-02-16Build in checkoutDaniel Barkalow
2008-02-10Use diff -u instead of diff in t7201Daniel Barkalow
2008-02-05Test :/string form for checkoutDaniel Barkalow
2007-12-10Add more checkout testsDaniel Barkalow
2007-11-04clean: require -f to do damage by defaultJunio C Hamano
2007-06-08checkout: do not get confused with ambiguous tag/branch namesJunio C Hamano
2007-04-04checkout: allow detaching to HEAD even when switching to the tip of a branchJunio C Hamano
2007-01-24git-checkout -m: fix merge caseJunio C Hamano
2007-01-17Use merge-recursive in git-checkout -m (branch switching)Junio C Hamano