summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* config: add a ProgramData levelcmn/programdata-configCarlos Martín Nieto2015-10-219-10/+123
* Merge pull request #3466 from libgit2/cmn/quick-parse-64Edward Thomson2015-10-153-4/+39
|\
| * revwalk: make commit list use 64 bits for timecmn/quick-parse-64Carlos Martín Nieto2015-10-143-4/+39
* | Merge pull request #3444 from ethomson/add_preserves_conflict_modeCarlos Martín Nieto2015-10-153-22/+171
|\ \
| * | index: also try conflict mode when insertingEdward Thomson2015-09-303-23/+149
| * | index: test that add_bypath preserves modeEdward Thomson2015-09-291-0/+23
* | | Merge pull request #3468 from libgit2/vmg/odb-lookupsVicent Marti2015-10-153-166/+175
|\ \ \
| * | | odb: Prioritize alternate backendsvmg/odb-lookupsVicent Marti2015-10-142-12/+16
| * | | odb: Be smarter when refreshing backendsVicent Marti2015-10-142-154/+159
|/ / /
* | | Merge pull request #3453 from libgit2/cmn/warn-pythonEdward Thomson2015-10-141-1/+6
|\ \ \ | |_|/ |/| |
| * | CMake: be more explicit with python errorscmn/warn-pythonCarlos Martín Nieto2015-10-061-1/+6
* | | Merge pull request #3455 from Eun/masterCarlos Martín Nieto2015-10-071-0/+1
|\ \ \
| * | | fix returnEun2015-10-071-0/+1
|/ / /
* | | Merge pull request #3451 from ethomson/xdiffEdward Thomson2015-10-0616-155/+335
|\ \ \
| * | | blame: guard xdiff calls for large filesEdward Thomson2015-10-053-9/+29
| * | | diff: don't feed large files to xdiffEdward Thomson2015-10-058-20/+23
| * | | merge_file: treat large files as binaryEdward Thomson2015-10-055-82/+170
| * | | xdiff: convert size variables to size_tEdward Thomson2015-10-053-50/+110
| * | | GITERR_CHECK_ALLOC_ADDn: multi-arg addersEdward Thomson2015-10-051-0/+9
|/ / /
* | | Merge pull request #3447 from arthurschreiber/arthur/fix-odb-refdb-freeCarlos Martín Nieto2015-10-015-10/+10
|\ \ \
| * | | refdb and odb backends must provide `free` functionArthur Schreiber2015-10-015-10/+10
|/ / /
* | | Merge pull request #3446 from ethomson/portabilityCarlos Martín Nieto2015-09-303-14/+38
|\ \ \
| * | | qsort_r/qsort_s: detect their supportEdward Thomson2015-09-302-18/+23
| * | | p_futimes: support using futimens when availableEdward Thomson2015-09-302-1/+20
* | | | Merge pull request #3445 from libgit2/cmn/ssl-nullEdward Thomson2015-09-301-1/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | openssl: don't try to teardown an unconnected SSL contextcmn/ssl-nullCarlos Martín Nieto2015-09-301-1/+6
|/ / /
* | | Merge pull request #3411 from spraints/custom-push-headersCarlos Martín Nieto2015-09-3016-26/+197
|\ \ \
| * | | Copy custom_headers insteach of referencing the caller's copyMatt Burke2015-09-255-24/+26
| * | | These can be staticMatt Burke2015-09-242-4/+4
| * | | Revise custom header error messagesMatt Burke2015-09-241-40/+44
| * | | Don't null-checkMatt Burke2015-09-241-3/+0
| * | | Use an array of forbidden custom headersMatt Burke2015-09-241-9/+12
| * | | Avoid segfault when opts == NULLMatt Burke2015-09-101-3/+8
| * | | Add a test for custom header validationMatt Burke2015-09-102-6/+39
| * | | More specific namesMatt Burke2015-09-101-4/+4
| * | | Validate custom http headersMatt Burke2015-09-101-0/+53
| * | | Ignore NULL headersMatt Burke2015-09-102-11/+14
| * | | Accept custom headers for fetch tooMatt Burke2015-09-102-2/+11
| * | | o iMatt Burke2015-09-081-0/+1
| * | | Update another call to git_remote_connectMatt Burke2015-09-081-1/+1
| * | | Teach winhttp about the extra headersMatt Burke2015-09-081-0/+17
| * | | Hook up the custom_headers to the http transportMatt Burke2015-09-083-4/+16
| * | | Tell the git_transport about the custom_headersMatt Burke2015-09-0810-24/+43
| * | | Add custom_headers to git_push_optionsMatt Burke2015-09-081-0/+5
| * | | Drop extra_http_headers from git_remoteMatt Burke2015-09-085-18/+0
| * | | Allow the world to set HTTP headers for remotesMatt Burke2015-09-044-3/+16
| * | | Pull extra_http_headers from the git_remoteMatt Burke2015-09-043-0/+4
| * | | Put the extra headers on the connection_data insteadMatt Burke2015-09-042-4/+4
| * | | Add more headers to HTTP requestsMatt Burke2015-09-041-0/+9
* | | | Merge pull request #3443 from libgit2/longpath-printfCarlos Martín Nieto2015-09-291-2/+0
|\ \ \ \ | |_|_|/ |/| | |