summaryrefslogtreecommitdiff
path: root/src/checkout.h
Commit message (Collapse)AuthorAgeFilesLines
* git_checkout_opts -> git_checkout_optionsBen Straub2014-03-061-1/+1
|
* clone: const-ify checkout optionsCarlos Martín Nieto2013-10-021-1/+1
| | | | | The removal of many options which lead to the direct usage of the user's checkout options means we should make sure they remain const.
* update copyrightsEdward Thomson2013-01-081-1/+1
|
* More checkout improvementsRussell Belfer2013-01-041-14/+7
| | | | | | | This flips checkout back to be driven off the changes between the baseline and the target trees. This reinstates the complex code for tracking the contents of the working directory, but overall, I think the resulting logic is easier to follow.
* Rework checkout internals (again)Russell Belfer2013-01-041-0/+31
I've tried to map out the detailed behaviors of checkout and make sure that we're handling the various cases correctly, along with providing options to allow us to emulate "git checkout" and "git checkout-index" with the various flags. I've thrown away flags in the checkout API that seemed like clutter and added some new ones. Also, I've converted the conflict callback to a general notification callback so we can emulate "git checkout" output and display "dirty" files. As of this commit, the new behavior is not working 100% but some of that is probably baked into tests that are not testing the right thing. This is a decent snapshot point, I think, along the way to getting the update done.