summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* merge: Plug memory leakvmg/reuc-insertVicent Marti2015-10-271-3/+3
* merge: Implement `GIT_MERGE_TREE_SKIP_REUC`Vicent Marti2015-10-271-28/+43
* reuc: Be smarter when inserting new REUC entriesVicent Marti2015-10-271-19/+16
* Merge pull request #3481 from ethomson/xdiff_includeCarlos Martín Nieto2015-10-231-1/+1
|\
| * xdiff: reference util.h in parent directoryEdward Thomson2015-10-221-1/+1
* | merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICTEdward Thomson2015-10-221-1/+8
* | Merge pull request #3480 from ethomson/nsecsCarlos Martín Nieto2015-10-221-1/+3
|\ \
| * | diff: ignore nsecs when diffingEdward Thomson2015-10-221-1/+3
| |/
* | Merge pull request #3475 from libgit2/cmn/programdata-configEdward Thomson2015-10-217-5/+64
|\ \ | |/ |/|
| * config: add a ProgramData levelcmn/programdata-configCarlos Martín Nieto2015-10-217-5/+64
* | index: Remove unneeded constsVicent Marti2015-10-211-3/+3
* | signature: Strip crud just like Git doesVicent Marti2015-10-211-2/+16
|/
* Merge pull request #3466 from libgit2/cmn/quick-parse-64Edward Thomson2015-10-152-4/+4
|\
| * revwalk: make commit list use 64 bits for timecmn/quick-parse-64Carlos Martín Nieto2015-10-142-4/+4
* | Merge pull request #3444 from ethomson/add_preserves_conflict_modeCarlos Martín Nieto2015-10-151-15/+62
|\ \
| * | index: also try conflict mode when insertingEdward Thomson2015-09-301-15/+62
* | | odb: Prioritize alternate backendsvmg/odb-lookupsVicent Marti2015-10-141-4/+8
* | | odb: Be smarter when refreshing backendsVicent Marti2015-10-142-154/+159
| |/ |/|
* | blame: guard xdiff calls for large filesEdward Thomson2015-10-053-9/+29
* | diff: don't feed large files to xdiffEdward Thomson2015-10-057-17/+20
* | merge_file: treat large files as binaryEdward Thomson2015-10-054-82/+82
* | xdiff: convert size variables to size_tEdward Thomson2015-10-053-50/+110
* | GITERR_CHECK_ALLOC_ADDn: multi-arg addersEdward Thomson2015-10-051-0/+9
* | refdb and odb backends must provide `free` functionArthur Schreiber2015-10-012-8/+3
* | Merge pull request #3446 from ethomson/portabilityCarlos Martín Nieto2015-09-302-14/+22
|\ \
| * | qsort_r/qsort_s: detect their supportEdward Thomson2015-09-301-13/+8
| * | p_futimes: support using futimens when availableEdward Thomson2015-09-301-1/+14
* | | 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-307-7/+135
|\ \ \ | |_|/ |/| |
| * | 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-101-6/+12
| * | 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-101-2/+6
| * | o iMatt Burke2015-09-081-0/+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-083-6/+19
| * | Drop extra_http_headers from git_remoteMatt Burke2015-09-084-15/+0
| * | Allow the world to set HTTP headers for remotesMatt Burke2015-09-043-3/+13
| * | 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
* | | Plug some leaksCarlos Martín Nieto2015-09-271-0/+3