aboutsummaryrefslogtreecommitdiff
path: root/t/t7201-co.sh
Commit message (Expand)AuthorAge
* branch/checkout --track: Ensure that upstream branch is indeed a branchJohan Herland2011-02-16
* checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-20
* checkout --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-20
* tests: document format of conflicts from checkout -mJonathan Nieder2010-03-20
* Reword "detached HEAD" notificationJunio C Hamano2010-01-29
* Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Junio C Hamano2010-01-17
|\
| * checkout -m path: fix recreating conflictsJunio C Hamano2010-01-06
* | test: checkout shouldn't say that HEAD has moved if it didn'tNanako Shiraishi2009-05-16
* | Change double quotes to single quotes in messageJari Aalto2009-04-07
|/
* Merge branch 'jc/maint-co-track'Junio C Hamano2008-10-21
|\
| * Enhance hold_lock_file_for_{update,append}() APIJunio C Hamano2008-10-19
| * demonstrate breakage of detached checkout with symbolic link HEADJunio C Hamano2008-10-19
| * Fix "checkout --track -b newbranch" on detached HEADJunio C Hamano2008-10-17
* | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-29
|\ \
| * | checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano2008-08-31
| * | checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-30
| * | checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-30
| * | checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-30
* | | Merge branch 'db/maint-checkout-b'Junio C Hamano2008-09-21
|\ \ \
| * | | Check early that a new branch is new and validDaniel Barkalow2008-09-21
| | |/ | |/|
| * | Merge branch 'jc/maint-checkout-fix' into maintJunio C Hamano2008-09-10
| |\ \ | | |/
* | | Merge branch 'jc/maint-checkout-fix'Junio C Hamano2008-09-07
|\ \ \ | | |/ | |/|
| * | checkout: do not check out unmerged higher stages randomlyJunio C Hamano2008-08-30
* | | Merge branch 'maint'Junio C Hamano2008-09-03
|\ \ \ | | |/ | |/|
| * | tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-03
| |/
* | Extend "checkout --track" DWIM to support more casesAlex Riesen2008-08-22
* | checkout --track: make up a sensible branch name if '-b' was omittedJohannes Schindelin2008-08-11
|/
* t3200,t7201: replace '!' with test_must_failBrandon Casey2008-07-23
* add test_cmp function for test scriptsJeff King2008-03-13
* Merge branch 'js/branch-track'Junio C Hamano2008-02-27
|\
| * branch: optionally setup branch.*.merge from upstream local branchesJay Soffian2008-02-19
* | Merge branch 'db/checkout'Junio C Hamano2008-02-27
|\ \
| * | checkout: work from a subdirectoryJunio C Hamano2008-02-20
| |/
| * Build in checkoutDaniel Barkalow2008-02-16
| * Use diff -u instead of diff in t7201Daniel Barkalow2008-02-09
* | Test :/string form for checkoutDaniel Barkalow2008-02-04
|/
* Add more checkout testsDaniel Barkalow2007-12-10
* clean: require -f to do damage by defaultJunio C Hamano2007-11-04
* checkout: do not get confused with ambiguous tag/branch namesJunio C Hamano2007-06-08
* checkout: allow detaching to HEAD even when switching to the tip of a branchJunio C Hamano2007-04-03
* git-checkout -m: fix merge caseJunio C Hamano2007-01-23
* Use merge-recursive in git-checkout -m (branch switching)Junio C Hamano2007-01-16
* Allow git-checkout when on a non-existant branch.Shawn Pearce2006-09-27
* checkout -m: fix read-tree invocationv1.4.1-rc2Junio C Hamano2006-06-28
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-12 07:54:12 +0000