| Commit message (Expand) | Author | Age |
* | tests: fix diff order arguments in test_cmp | Stefan Beller | 2017-10-07 |
* | i18n: advice: mark string about detached head for translation | Vasco Almeida | 2016-06-17 |
* | t7201: fix &&-chain breakage | Jeff King | 2015-03-20 |
* | t: fix &&-chaining issues around setup which might fail | Jeff King | 2015-03-20 |
* | checkout -m: attempt merge when deletion of path was staged | Jonathan Nieder | 2014-08-25 |
* | t7201.24: Add refspec to keep --track working | Johan Herland | 2013-04-21 |
* | tests: modernise style: more uses of test_line_count | Stefano Lattarini | 2012-04-11 |
* | i18n: use test_i18ngrep in t7201 | Junio C Hamano | 2011-04-13 |
* | Merge branch 'ab/i18n-st' | Junio C Hamano | 2011-04-01 |
|\ |
|
| * | i18n: git-checkout "HEAD is now at" message | Ævar Arnfjörð Bjarmason | 2011-03-09 |
* | | branch/checkout --track: Ensure that upstream branch is indeed a branch | Johan Herland | 2011-02-16 |
|/ |
|
* | checkout -m --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 |
* | checkout --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 |
* | tests: document format of conflicts from checkout -m | Jonathan Nieder | 2010-03-20 |
* | Reword "detached HEAD" notification | Junio C Hamano | 2010-01-29 |
* | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' | Junio C Hamano | 2010-01-17 |
|\ |
|
| * | checkout -m path: fix recreating conflicts | Junio C Hamano | 2010-01-06 |
* | | test: checkout shouldn't say that HEAD has moved if it didn't | Nanako Shiraishi | 2009-05-16 |
* | | Change double quotes to single quotes in message | Jari Aalto | 2009-04-07 |
|/ |
|
* | Merge branch 'jc/maint-co-track' | Junio C Hamano | 2008-10-21 |
|\ |
|
| * | Enhance hold_lock_file_for_{update,append}() API | Junio C Hamano | 2008-10-19 |
| * | demonstrate breakage of detached checkout with symbolic link HEAD | Junio C Hamano | 2008-10-19 |
| * | Fix "checkout --track -b newbranch" on detached HEAD | Junio C Hamano | 2008-10-17 |
* | | Merge branch 'jc/better-conflict-resolution' | Shawn O. Pearce | 2008-09-29 |
|\ \ |
|
| * | | checkout --conflict=<style>: recreate merge in a non-default style | Junio C Hamano | 2008-08-31 |
| * | | checkout -m: recreate merge when checking out of unmerged index | Junio C Hamano | 2008-08-30 |
| * | | checkout --ours/--theirs: allow checking out one side of a conflicting merge | Junio C Hamano | 2008-08-30 |
| * | | checkout -f: allow ignoring unmerged paths when checking out of the index | Junio C Hamano | 2008-08-30 |
* | | | Merge branch 'db/maint-checkout-b' | Junio C Hamano | 2008-09-21 |
|\ \ \ |
|
| * | | | Check early that a new branch is new and valid | Daniel Barkalow | 2008-09-21 |
| | |/
| |/| |
|
| * | | Merge branch 'jc/maint-checkout-fix' into maint | Junio C Hamano | 2008-09-10 |
| |\ \
| | |/ |
|
* | | | Merge branch 'jc/maint-checkout-fix' | Junio C Hamano | 2008-09-07 |
|\ \ \
| | |/
| |/| |
|
| * | | checkout: do not check out unmerged higher stages randomly | Junio C Hamano | 2008-08-30 |
* | | | Merge branch 'maint' | Junio C Hamano | 2008-09-03 |
|\ \ \
| | |/
| |/| |
|
| * | | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 2008-09-03 |
| |/ |
|
* | | Extend "checkout --track" DWIM to support more cases | Alex Riesen | 2008-08-22 |
* | | checkout --track: make up a sensible branch name if '-b' was omitted | Johannes Schindelin | 2008-08-11 |
|/ |
|
* | t3200,t7201: replace '!' with test_must_fail | Brandon Casey | 2008-07-23 |
* | add test_cmp function for test scripts | Jeff King | 2008-03-13 |
* | Merge branch 'js/branch-track' | Junio C Hamano | 2008-02-27 |
|\ |
|
| * | branch: optionally setup branch.*.merge from upstream local branches | Jay Soffian | 2008-02-19 |
* | | Merge branch 'db/checkout' | Junio C Hamano | 2008-02-27 |
|\ \ |
|
| * | | checkout: work from a subdirectory | Junio C Hamano | 2008-02-20 |
| |/ |
|
| * | Build in checkout | Daniel Barkalow | 2008-02-16 |
| * | Use diff -u instead of diff in t7201 | Daniel Barkalow | 2008-02-09 |
* | | Test :/string form for checkout | Daniel Barkalow | 2008-02-04 |
|/ |
|
* | Add more checkout tests | Daniel Barkalow | 2007-12-10 |
* | clean: require -f to do damage by default | Junio C Hamano | 2007-11-04 |
* | checkout: do not get confused with ambiguous tag/branch names | Junio C Hamano | 2007-06-08 |
* | checkout: allow detaching to HEAD even when switching to the tip of a branch | Junio C Hamano | 2007-04-03 |