delta/libgit2.git/include/git2/checkout.h, branch cmn/read-tree-cache

Formatting fixes for the docs

2014-06-03T14:05:35+00:00

These are some issues I found while playing around with the new parser
for docurium.

Fix remaining init_options inconsistencies

2014-05-02T16:21:33+00:00

There were a couple of "init_opts()" functions a few more cases
of structure initialization that I somehow missed.

git_checkout_opts -> git_checkout_options

2014-03-06T17:44:51+00:00

Added function-based initializers for every options struct.

2014-03-06T02:49:23+00:00

The basic structure of each function is courtesy of arrbee.

Introduce diff3 mode for checking out conflicts

2014-01-20T22:15:13+00:00

Overwrite ignored files on checkout

2013-12-13T14:29:55+00:00

Fix checkout notify callback docs and tests

2013-12-11T18:57:50+00:00

The checkout notify callback behavior on non-zero return values
was not being tested.  This adds tests, fixes a bug with positive
values, and clarifies the documentation to make it clear that the
checkout can be canceled via this mechanism.

Checkout: Don't assert if treeish is NULL

2013-11-02T03:43:34+00:00

In git_checkout_tree, the first check tests if either repo or treeish is
NULL and says that eithor of them has to have a valid value. But there
is no code to handle the treeish == NULL case.

So, do something meaningful in that case: use HEAD instead.

Checkout: Unifiy const-ness of `opts` parameter

2013-11-02T03:20:05+00:00

Since all 3 checkout APIs perform the same operation with the options,
all of them should use the same const-ness.

checkout (from index) can write conflicts

2013-10-16T20:20:06+00:00