summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge branch 'jc/maint-checkout-keep-remove' into maintJunio C Hamano2008-09-181-0/+2
| |\ \ \
| * \ \ \ Merge branch 'jc/maint-checkout-fix' into maintJunio C Hamano2008-09-101-1/+28
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | Merge branch 'jc/maint-checkout-keep-remove'Junio C Hamano2008-09-161-0/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | checkout: do not lose staged removalJunio C Hamano2008-09-091-0/+2
| |/ / /
* | | | Merge branch 'jc/maint-checkout-fix'Junio C Hamano2008-09-071-1/+28
|\ \ \ \ | | |/ / | |/| |
| * | | checkout: do not check out unmerged higher stages randomlyJunio C Hamano2008-08-301-1/+28
* | | | Merge branch 'maint'Junio C Hamano2008-09-031-6/+4
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | checkout: fix message when leaving detached HEADJeff King2008-09-031-6/+4
| |/
* | Extend "checkout --track" DWIM to support more casesAlex Riesen2008-08-221-13/+13
* | checkout --track: make up a sensible branch name if '-b' was omittedJohannes Schindelin2008-08-111-3/+18
|/
* git-checkout: improve error messages, detect ambiguities.Pierre Habouzit2008-07-241-17/+65
* Merge branch 'maint' into ph/checkoutJunio C Hamano2008-07-231-1/+2
|\
| * git-checkout: fix command line parsing.Pierre Habouzit2008-07-231-1/+2
* | add context pointer to read_tree_recursive()René Scharfe2008-07-151-2/+2
* | Refactor "tracking statistics" code used by "git checkout"Junio C Hamano2008-07-021-88/+6
|/
* checkout: "best effort" checkoutJunio C Hamano2008-05-291-4/+18
* checkout: consolidate reset_{to_new,clean_to_new}()Junio C Hamano2008-05-291-35/+15
* checkout: make reset_clean_to_new() not die by itselfJunio C Hamano2008-05-281-3/+6
* "git checkout -- paths..." should error out when paths cannot be writtenJunio C Hamano2008-05-281-2/+5
* Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano2008-05-251-1/+1
|\
| * Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-1/+1
* | Merge branch 'jc/unpack-trees-reword'Junio C Hamano2008-05-251-0/+2
|\ \
| * | unpack-trees: allow Porcelain to give different error messagesJunio C Hamano2008-05-191-0/+2
| |/
* | Extend interface of add_files_to_cache to allow ignore indexing errorsAlex Riesen2008-05-121-1/+1
|/
* Merge branch 'maint'Junio C Hamano2008-05-031-1/+1
|\
| * checkout: don't rfc2047-encode oneline on detached HEADJeff King2008-05-031-1/+1
* | git checkout: add -t alias for --trackMiklos Vajna2008-04-271-1/+1
|/
* Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-091-3/+6
* Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds2008-03-091-0/+6
* cleanup: remove unused git_checkout_configDenis Cheng2008-03-021-6/+1
* Write index file on any checkout of filesDaniel Barkalow2008-02-291-15/+15
* Fix builtin checkout crashing when given an invalid pathAlex Riesen2008-02-291-0/+4
* Merge branch 'js/branch-track'Junio C Hamano2008-02-271-9/+5
|\
| * branch: optionally setup branch.*.merge from upstream local branchesJay Soffian2008-02-191-9/+5
* | checkout: error out when index is unmerged even with -mJunio C Hamano2008-02-241-17/+18
* | checkout: show progress when checkout takes long time while switching branchesJunio C Hamano2008-02-231-0/+1
* | checkout: updates to tracking reportJunio C Hamano2008-02-211-5/+5
* | builtin-checkout.c: Remove unused prefix arguments in switch_branches pathDaniel Barkalow2008-02-211-6/+4
* | checkout: work from a subdirectoryJunio C Hamano2008-02-201-1/+0
* | checkout: tone down the "forked status" diagnostic messagesJunio C Hamano2008-02-201-40/+64
|/
* Clean up reporting differences on branch switchDaniel Barkalow2008-02-191-71/+7
* builtin-checkout.c: fix possible usage segfaultJay Soffian2008-02-181-0/+1
* checkout: notice when the switched branch is behind or forkedJunio C Hamano2008-02-161-0/+136
* Build in checkoutDaniel Barkalow2008-02-161-0/+477