delta/libgit2.git, branch ethomson/header_guards

consistent header guards

2018-02-01T23:56:33+00:00

use consistent names for the #include / #define header guard pattern.

Merge pull request #4040 from tiennou/examples/merge

2018-02-01T09:42:33+00:00

Merge example

Merge pull request #4507 from tomas/patch-1

2018-01-31T22:48:42+00:00

Honor 'GIT_USE_NSEC' option in `filesystem_iterator_set_current`

Merge pull request #4488 from libgit2/ethomson/conflict_marker_size

2018-01-31T17:28:43+00:00

Use longer conflict markers in recursive merge base

Set ctime/mtime nanosecs to 0 if USE_NSEC is not defined

2018-01-31T17:28:25+00:00

Merge pull request #4490 from libgit2/ethomson/apfs_precompose_fixes

2018-01-31T17:27:39+00:00

status::renames: test update for APFS (write NFD instead of NFC filename)

Honor 'GIT_USE_NSEC' option in `filesystem_iterator_set_current`

2018-01-31T02:21:19+00:00

This should have been part of PR #3638. Without this we still get 
nsec-related errors, even when using -DGIT_USE_NSEC:

 error: ‘struct stat’ has no member named ‘st_mtime_nsec’

Merge pull request #4474 from pks-t/pks/null-oid

2018-01-29T22:37:12+00:00

Special-casing null OIDs

Merge pull request #4502 from pks-t/pks/security-reporting

2018-01-29T22:35:50+00:00

README.md: add notes on how to report security issues

README.md: add notes on how to report security issues

2018-01-29T07:42:12+00:00