summaryrefslogtreecommitdiff
path: root/t/t7201-co.sh
Commit message (Expand)AuthorAgeFilesLines
* checkout -m: attempt merge when deletion of path was stagedjn/unpack-trees-checkout-m-carry-deletionJonathan Nieder2014-08-251-0/+17
* t7201.24: Add refspec to keep --track workingJohan Herland2013-04-211-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-131-7/+7
* Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-5/+5
|\
| * i18n: git-checkout "HEAD is now at" messageÆvar Arnfjörð Bjarmason2011-03-091-5/+5
* | branch/checkout --track: Ensure that upstream branch is indeed a branchJohan Herland2011-02-161-7/+9
|/
* checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-201-1/+1
* checkout --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-201-2/+2
* tests: document format of conflicts from checkout -mJonathan Nieder2010-03-201-4/+61
* Reword "detached HEAD" notificationJunio C Hamano2010-01-291-10/+22
* Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Junio C Hamano2010-01-171-0/+57
|\
| * checkout -m path: fix recreating conflictsJunio C Hamano2010-01-061-0/+57
* | test: checkout shouldn't say that HEAD has moved if it didn'tNanako Shiraishi2009-05-161-0/+8
* | Change double quotes to single quotes in messageJari Aalto2009-04-071-1/+1
|/
* Merge branch 'jc/maint-co-track'Junio C Hamano2008-10-211-6/+20
|\
| * Enhance hold_lock_file_for_{update,append}() APIJunio C Hamano2008-10-191-1/+1
| * demonstrate breakage of detached checkout with symbolic link HEADJunio C Hamano2008-10-191-0/+12
| * Fix "checkout --track -b newbranch" on detached HEADJunio C Hamano2008-10-171-6/+8
* | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-291-2/+121
|\ \
| * | checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano2008-08-311-46/+54
| * | checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-301-0/+63
| * | checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-301-0/+25
| * | checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-301-0/+23
* | | Merge branch 'db/maint-checkout-b'Junio C Hamano2008-09-211-0/+10
|\ \ \
| * | | Check early that a new branch is new and validDaniel Barkalow2008-09-211-0/+10
| | |/ | |/|
| * | Merge branch 'jc/maint-checkout-fix' into maintJunio C Hamano2008-09-101-0/+22
| |\ \ | | |/
* | | Merge branch 'jc/maint-checkout-fix'Junio C Hamano2008-09-071-0/+22
|\ \ \ | | |/ | |/|
| * | checkout: do not check out unmerged higher stages randomlyJunio C Hamano2008-08-301-0/+22
* | | Merge branch 'maint'Junio C Hamano2008-09-031-1/+1
|\ \ \ | | |/ | |/|
| * | tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-031-1/+1
| |/
* | Extend "checkout --track" DWIM to support more casesAlex Riesen2008-08-221-1/+22
* | checkout --track: make up a sensible branch name if '-b' was omittedJohannes Schindelin2008-08-111-0/+11
|/
* t3200,t7201: replace '!' with test_must_failBrandon Casey2008-07-231-1/+1
* add test_cmp function for test scriptsJeff King2008-03-131-9/+9
* Merge branch 'js/branch-track'Junio C Hamano2008-02-271-0/+24
|\
| * branch: optionally setup branch.*.merge from upstream local branchesJay Soffian2008-02-191-0/+24
* | Merge branch 'db/checkout'Junio C Hamano2008-02-271-16/+43
|\ \
| * | checkout: work from a subdirectoryJunio C Hamano2008-02-201-0/+34
| |/
| * Build in checkoutDaniel Barkalow2008-02-161-7/+0
| * Use diff -u instead of diff in t7201Daniel Barkalow2008-02-091-9/+9
* | Test :/string form for checkoutDaniel Barkalow2008-02-041-0/+16
|/
* Add more checkout testsDaniel Barkalow2007-12-101-3/+43
* clean: require -f to do damage by defaultJunio C Hamano2007-11-041-6/+6
* checkout: do not get confused with ambiguous tag/branch namesJunio C Hamano2007-06-081-0/+40
* checkout: allow detaching to HEAD even when switching to the tip of a branchJunio C Hamano2007-04-031-1/+62
* git-checkout -m: fix merge caseJunio C Hamano2007-01-231-1/+27
* Use merge-recursive in git-checkout -m (branch switching)Junio C Hamano2007-01-161-8/+33
* Allow git-checkout when on a non-existant branch.Shawn Pearce2006-09-271-0/+9
* checkout -m: fix read-tree invocationv1.4.1-rc2Junio C Hamano2006-06-281-0/+72
View Lorry Controller Status