summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* consistent header guardsethomson/header_guardsEdward Thomson2018-02-0148-86/+92
* Merge pull request #4040 from tiennou/examples/mergePatrick Steinhardt2018-02-017-36/+447
|\
| * examples: zero out our options memory before useEtienne Samson2018-01-251-0/+2
| * examples: our/their can be NULLEtienne Samson2018-01-251-2/+4
| * examples: fix remaining review commentsEtienne Samson2018-01-251-0/+2
| * examples: move support code into static functionsEtienne Samson2018-01-251-81/+97
| * examples: hoist the merge analysis back into mainEtienne Samson2018-01-251-58/+39
| * examples: minor review fixupsEtienne Samson2018-01-251-10/+12
| * examples: add mergeEtienne Samson2018-01-251-0/+391
| * examples: Dead code & warningsEtienne Samson2018-01-251-7/+0
| * examples: Move xrealloc to common example codeEtienne Samson2018-01-253-10/+15
| * examples: Switch to the nifty argv helpers from commonEtienne Samson2018-01-252-19/+36
* | 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-317-8/+23
|\ \ \
| * | | CHANGELOG: include merge_file conflict marker sizeethomson/conflict_marker_sizeEdward Thomson2018-01-211-0/+6
| * | | merge: recursive uses larger conflict markersEdward Thomson2018-01-214-8/+9
| * | | merge: allow custom conflict marker sizeEdward Thomson2018-01-212-0/+8
| | |/ | |/|
* | | Merge pull request #4490 from libgit2/ethomson/apfs_precompose_fixesEdward Thomson2018-01-311-1/+7
|\ \ \ | |_|/ |/| |
| * | status::renames: write NFD instead of NFC filenameethomson/apfs_precompose_fixesEdward Thomson2018-01-211-1/+7
| |/
* | Merge pull request #4474 from pks-t/pks/null-oidEdward Thomson2018-01-294-1/+60
|\ \
| * | odb: reject reading and writing null OIDsPatrick Steinhardt2018-01-262-1/+43
| * | tree: reject writing null-OID entries to a treePatrick Steinhardt2018-01-262-0/+17
* | | Merge pull request #4502 from pks-t/pks/security-reportingEdward Thomson2018-01-291-0/+6
|\ \ \ | |/ / |/| |
| * | README.md: add notes on how to report security issuesPatrick Steinhardt2018-01-291-0/+6
|/ /
* | Merge pull request #4497 from medranocalvo/export-mempackPatrick Steinhardt2018-01-252-4/+6
|\ \ | |/ |/|
| * odb: export mempack backendAdrián Medraño Calvo2018-01-222-4/+6
|/
* 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 #4483 from libgit2/cmn/prettify-docsEdward Thomson2018-01-201-3/+2
|\ \ \
| * | | message: update docs for git_message_prettifycmn/prettify-docsCarlos Martín Nieto2018-01-191-3/+2
| | |/ | |/|
* | | Merge pull request #4481 from pks-t/pks/tests-online-clone-url-memleakCarlos Martín Nieto2018-01-191-0/+2
|\ \ \ | |/ / |/| |
| * | tests: online::clone: fix memory leak due to not freeing URLPatrick Steinhardt2018-01-181-0/+2
|/ /
* | Merge pull request #4451 from libgit2/charliesome/trailer-infoBrian Lopez2018-01-173-0/+622
|\ \
| * | rename find_trailer to extract_trailer_blockcharliesome/trailer-infoBrian Lopez2018-01-171-2/+2
| * | update code docsBrian Lopez2018-01-161-4/+15
| * | just use git_message_trailer in testsBrian Lopez2018-01-161-15/+10
| * | try and fix windows buildBrian Lopez2018-01-161-1/+2
| * | Change trailer API to return a simple arrayBrian Lopez2018-01-163-32/+46
| * | Merge remote-tracking branch 'origin/master' into charliesome/trailer-infoBrian Lopez2018-01-1022-123/+157
| |\ \ | | |/
| * | switch back to braced array initializersBrian Lopez2018-01-051-61/+40
| * | make separators const a macro as wellBrian Lopez2018-01-031-5/+4
| * | remove empty lines between @-linesBrian Lopez2018-01-031-3/+0
| * | make comment_line_char const a macroBrian Lopez2018-01-031-4/+4
| * | Don't use newer C syntax for declaration in testsBrian Lopez2018-01-031-57/+78
| * | Merge remote-tracking branch 'origin/master' into charliesome/trailer-infoBrian Lopez2018-01-0244-427/+1397
| |\ \
| * | | trailer: use git__prefixcmp instead of starts_withCharlie Somerville2017-12-201-15/+3
View Lorry Controller Status