delta/libgit2.git/include/git2, branch cmn/tls-register

stream: allow registering a user-provided TLS constructor

2015-11-03T16:10:29+00:00

This allows the application to use their own TLS stream, regardless of
the capabilities of libgit2 itself.

Add diff progress callback.

2015-11-02T21:33:58+00:00

Fix build for custom transport users

2015-10-30T18:17:11+00:00

We should explicitly include the declaration of git_strarray
from "include/git2/sys/transport.h"

merge: Implement `GIT_MERGE_TREE_SKIP_REUC`

2015-10-27T21:44:26+00:00

Merge pull request #3477 from linquize/inttypes.h

2015-10-23T15:13:14+00:00

inttypes.h is built-in header file since MSVC 2013

merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT

2015-10-22T18:55:17+00:00

Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which
will stop on the first conflict and fail the merge operation with
GIT_EMERGECONFLICT.

inttypes.h is built-in header file since MSVC 2013

2015-10-21T23:56:34+00:00

The reason is that the types defined in libgit2's inttypes.h collide with system inttypes.h
3rd party library header files may directly reference MSVC's built-in inttypes.h

Fixes #3476

Merge pull request #3475 from libgit2/cmn/programdata-config

2015-10-21T20:43:22+00:00

config: add a ProgramData level

win32: add c linkage guard around inttypes.h inclusion

2015-10-21T13:24:10+00:00

config: add a ProgramData level

2015-10-21T13:11:18+00:00

This is where portable git stores the global configuration which we can
use to adhere to it even though git isn't quite installed on the system.