summaryrefslogtreecommitdiff
path: root/t/t7201-co.sh
AgeCommit message (Expand)AuthorFilesLines
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
2008-02-16Build in checkoutLibravatar Daniel Barkalow1-7/+0
2008-02-09Use diff -u instead of diff in t7201Libravatar Daniel Barkalow1-9/+9
2008-02-04Test :/string form for checkoutLibravatar Daniel Barkalow1-0/+16
2007-12-10Add more checkout testsLibravatar Daniel Barkalow1-3/+43
2007-11-04clean: require -f to do damage by defaultLibravatar Junio C Hamano1-6/+6
2007-06-08checkout: do not get confused with ambiguous tag/branch namesLibravatar Junio C Hamano1-0/+40
2007-04-03checkout: allow detaching to HEAD even when switching to the tip of a branchLibravatar Junio C Hamano1-1/+62
2007-01-23git-checkout -m: fix merge caseLibravatar Junio C Hamano1-1/+27
2007-01-16Use merge-recursive in git-checkout -m (branch switching)Libravatar Junio C Hamano1-8/+33
2006-09-27Allow git-checkout when on a non-existant branch.Libravatar Shawn Pearce1-0/+9
2006-06-28checkout -m: fix read-tree invocationLibravatar Junio C Hamano1-0/+72
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 08:04:25 +0000