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