summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* merge: virtual commit should be last argument to merge-baseethomson/recursiveTyrie Vella2018-02-041-2/+8
* merge: reverse merge bases for recursive mergeEdward Thomson2018-02-041-7/+11
* oidarray: introduce git_oidarray__reverseEdward Thomson2018-02-042-0/+13
* Merge pull request #4489 from libgit2/ethomson/conflicts_crlfEdward Thomson2018-02-0416-133/+278
|\
| * xdiff: upgrade to git's included xdiffEdward Thomson2018-01-2116-133/+278
* | Merge pull request #4499 from pks-t/pks/setuid-configEdward Thomson2018-02-021-7/+74
|\ \
| * | sysdir: do not use environment in setuid casePatrick Steinhardt2018-02-021-7/+74
| |/
* | Merge pull request #4512 from libgit2/ethomson/header_guardsEdward Thomson2018-02-0248-86/+92
|\ \
| * | consistent header guardsethomson/header_guardsEdward Thomson2018-02-0148-86/+92
* | | Merge pull request #4510 from pks-t/pks/attr-file-bare-statEdward Thomson2018-02-022-4/+20
|\ \ \ | |/ / |/| |
| * | attr: avoid stat'ting files for bare repositoriesPatrick Steinhardt2018-02-012-4/+20
* | | Merge pull request #4507 from tomas/patch-1Edward Thomson2018-01-311-2/+7
|\ \ \
| * | | Set ctime/mtime nanosecs to 0 if USE_NSEC is not definedTomás Pollak2018-01-311-0/+3
| * | | Honor 'GIT_USE_NSEC' option in `filesystem_iterator_set_current`Tomás Pollak2018-01-301-2/+4
* | | | Merge pull request #4488 from libgit2/ethomson/conflict_marker_sizeEdward Thomson2018-01-312-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | merge: recursive uses larger conflict markersEdward Thomson2018-01-211-0/+1
| * | | merge: allow custom conflict marker sizeEdward Thomson2018-01-211-0/+2
| | |/ | |/|
* | | odb: reject reading and writing null OIDsPatrick Steinhardt2018-01-261-1/+25
* | | tree: reject writing null-OID entries to a treePatrick Steinhardt2018-01-261-0/+6
| |/ |/|
* | odb: export mempack backendAdrián Medraño Calvo2018-01-221-0/+1
|/
* Merge pull request #4484 from pks-t/pks/fail-creating-branch-HEADEdward Thomson2018-01-201-0/+6
|\
| * branch: refuse creating branches named 'HEAD'Patrick Steinhardt2018-01-191-0/+6
* | Merge pull request #4478 from libgit2/cmn/packed-refs-sortedEdward Thomson2018-01-201-1/+1
|\ \ | |/ |/|
| * refs: include " sorted " in our packed-refs headercmn/packed-refs-sortedCarlos Martín Nieto2018-01-121-1/+1
* | Merge pull request #4451 from libgit2/charliesome/trailer-infoBrian Lopez2018-01-171-0/+416
|\ \
| * | rename find_trailer to extract_trailer_blockcharliesome/trailer-infoBrian Lopez2018-01-171-2/+2
| * | Change trailer API to return a simple arrayBrian Lopez2018-01-161-5/+19
| * | Merge remote-tracking branch 'origin/master' into charliesome/trailer-infoBrian Lopez2018-01-109-54/+99
| |\ \ | | |/
| * | make separators const a macro as wellBrian Lopez2018-01-031-5/+4
| * | make comment_line_char const a macroBrian Lopez2018-01-031-4/+4
| * | Merge remote-tracking branch 'origin/master' into charliesome/trailer-infoBrian Lopez2018-01-0228-399/+563
| |\ \
| * | | trailer: use git__prefixcmp instead of starts_withCharlie Somerville2017-12-201-15/+3
| * | | trailer: remove inline specifier on is_blank_lineCharlie Somerville2017-12-201-1/+1
| * | | message: add routine for parsing trailers from messagesCharlie Somerville2017-12-191-0/+415
* | | | transports: local: fix memory leak in reference walkPatrick Steinhardt2018-01-121-0/+2
| |_|/ |/| |
* | | cmake: add openssl to the private deps list when it's the TLS implementationCarlos Martín Nieto2018-01-081-0/+1
* | | cmake: treat LIBGIT2_PC_REQUIRES as a listCarlos Martín Nieto2018-01-081-2/+5
* | | Merge pull request #4398 from pks-t/pks/generic-sha1Edward Thomson2018-01-051-20/+26
|\ \ \
| * | | cmake: allow explicitly choosing SHA1 backendPatrick Steinhardt2018-01-041-20/+26
| | |/ | |/|
* | | Merge pull request #4437 from pks-t/pks/openssl-hash-errorsEdward Thomson2018-01-032-8/+31
|\ \ \
| * | | streams: openssl: fix thread-safety for OpenSSL error messagesPatrick Steinhardt2018-01-031-5/+13
| * | | hash: openssl: check return values of SHA1_* functionsPatrick Steinhardt2018-01-031-3/+18
| | |/ | |/|
* | | Merge pull request #4462 from pks-t/pks/diff-generated-excessive-statsEdward Thomson2018-01-035-10/+20
|\ \ \
| * | | diff_generate: avoid excessive stats of .gitattribute filesPatrick Steinhardt2018-01-035-10/+20
| | |/ | |/|
* | | Merge pull request #4439 from tiennou/fix/4352Patrick Steinhardt2018-01-031-5/+7
|\ \ \
| * | | cmake: create a dummy file for XcodeEtienne Samson2017-12-141-5/+7
| | |/ | |/|
* | | Merge pull request #4457 from libgit2/ethomson/tree_error_messagesPatrick Steinhardt2018-01-031-10/+10
|\ \ \ | |_|/ |/| |
| * | tree: standard error messages are lowercaseethomson/tree_error_messagesEdward Thomson2017-12-311-10/+10
* | | Merge pull request #4453 from libgit2/ethomson/spnegoEdward Thomson2018-01-011-4/+13
|\ \ \ | |/ / |/| |
| * | winhttp: properly support ntlm and negotiateethomson/spnegoEdward Thomson2017-12-291-4/+13
View Lorry Controller Status