summaryrefslogtreecommitdiff
path: root/src/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* Fixed a couple Clang warningsPierre-Olivier Latour2014-11-101-0/+4
* iterator: submodules are determined by an index or treecmn/submodule-and-dirCarlos Martín Nieto2014-11-071-3/+9
* checkout_index: Remove stage 0 when checking out conflictsEdward Thomson2014-11-061-3/+17
* checkout_index: remove conflicts when checking out new filesEdward Thomson2014-11-061-48/+137
* config: remove the refresh function and backend fieldcmn/config-refresh-removeCarlos Martín Nieto2014-10-231-2/+1
* Don't copy buffer in checkout unless neededEdward Thomson2014-10-131-6/+8
* Ensure filters (i.e. CRLF) are applied when checking out conflict contentJacques Germishuys2014-10-131-3/+19
* Merge remote-tracking branch 'origin/master' into fix-git-status-list-new-unr...Alan Rogers2014-07-221-23/+116
|\
| * git_checkout_index: checkout other indexesEdward Thomson2014-07-011-23/+116
* | Start adding GIT_DELTA_UNREADABLE and GIT_STATUS_WT_UNREADABLE.Alan Rogers2014-05-201-0/+2
|/
* Add filter options and ALLOW_UNSAFERussell Belfer2014-05-061-1/+2
* Fix remaining init_options inconsistenciesRussell Belfer2014-05-021-9/+4
* Add diff option to update index stat cacheRussell Belfer2014-05-021-1/+1
* Lay groundwork for updating stat cache in diffRussell Belfer2014-05-021-2/+1
* Add build option for diff internal statisticsRussell Belfer2014-05-021-2/+1
* Treat ignored, empty, and untracked dirs differentRussell Belfer2014-04-231-5/+5
* Make checkout match diff for untracked/ignored dirRussell Belfer2014-04-221-28/+57
* Make stash and checkout ignore contained reposRussell Belfer2014-04-221-2/+15
* Clean up index snapshot function namingRussell Belfer2014-04-171-3/+3
* Some index internals refactoringRussell Belfer2014-04-171-3/+7
* Some vector utility tweaksRussell Belfer2014-04-171-2/+6
* checkout: Fix submodule_is_config_only's return valueJiri Pospisil2014-04-021-1/+1
* Fix submodule leaks and invalid referencesRussell Belfer2014-03-251-5/+9
* Make submodules externally refcountedRussell Belfer2014-03-251-11/+15
* Introduce git_merge_file for consumersEdward Thomson2014-03-201-27/+16
* git_checkout_opts -> git_checkout_optionsBen Straub2014-03-061-14/+14
* Added function-based initializers for every options struct.Matthew Bowen2014-03-051-0/+12
* Fix checkout NONE to not remove fileRussell Belfer2014-01-301-1/+1
* Force explicit remove of files instead of deferRussell Belfer2014-01-301-0/+2
* diff: rename the file's 'oid' to 'id'Carlos Martín Nieto2014-01-251-7/+7
* index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-251-7/+7
* Plug a small memory leakBen Straub2014-01-221-1/+4
* Preserve tree filemode in index during checkoutEdward Thomson2014-01-221-2/+1
* Merge submodulesEdward Thomson2014-01-201-2/+19
* Load merge.conflictstyle setting from configEdward Thomson2014-01-201-0/+23
* Introduce diff3 mode for checking out conflictsEdward Thomson2014-01-201-1/+4
* Don't try to merge binary filesEdward Thomson2014-01-201-2/+45
* merge_file should use more aggressive levelsEdward Thomson2014-01-201-1/+2
* Overwrite ignored directories on checkoutEdward Thomson2013-12-131-2/+5
* Overwrite ignored files on checkoutEdward Thomson2013-12-131-6/+12
* Cleanups, renames, and leak fixesRussell Belfer2013-12-121-1/+1
* Fix checkout notify callback docs and testsRussell Belfer2013-12-111-2/+2
* One more rename/cleanup for callback err functionsRussell Belfer2013-12-111-4/+7
* Remove converting user error to GIT_EUSERRussell Belfer2013-12-111-125/+119
* Add git_vector_free_allRussell Belfer2013-12-111-8/+2
* Improve GIT_EUSER handlingRussell Belfer2013-12-111-10/+7
* move mode_t to filebuf_open instead of _commitEdward Thomson2013-11-041-2/+2
* Merge pull request #1937 from scunz/checkout_assertVicent Martí2013-11-041-19/+18
|\
| * Checkout: git_checkout_head is git_checkout_tree without a treeishSascha Cunz2013-11-021-13/+1
| * Checkout: Don't assert if treeish is NULLSascha Cunz2013-11-021-4/+15
View Lorry Controller Status