summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Entry argument passed to git_index_add_frombuffer() should be constPierre-Olivier Latour2015-04-031-1/+1
* Merge pull request #3011 from ethomson/filter_zero_tempbufEdward Thomson2015-03-251-0/+3
|\
| * filter: clear the temp_buf if we're using oneEdward Thomson2015-03-251-0/+3
* | squash some leaksEdward Thomson2015-03-242-5/+5
* | Merge pull request #2990 from leoyanggit/custom_paramEdward Thomson2015-03-246-8/+18
|\ \
| * | Add a custom param to git_smart_subtransport_definitionLeo Yang2015-03-186-8/+18
* | | Merge pull request #2986 from tkelman/mingw_winhttpEdward Thomson2015-03-241-22/+27
|\ \ \
| * | | Use swprintf_s everywhere except mingw.orgTony Kelman2015-03-191-3/+7
| * | | Fix build on mingw-w64Alex Crichton2015-03-161-2/+2
| * | | Win32: Enable WinHTTP for MinGWPhilip Kelley2015-03-161-23/+24
* | | | Merge pull request #2947 from libgit2/cmn/notes-bufEdward Thomson2015-03-241-21/+40
|\ \ \ \
| * | | | note: use a git_buf to return the default namespacecmn/notes-bufCarlos Martín Nieto2015-03-171-21/+40
* | | | | Merge pull request #3010 from ethomson/checkout_invalid_path_errCarlos Martín Nieto2015-03-241-1/+1
|\ \ \ \ \
| * | | | | checkout: report correct invalid pathEdward Thomson2015-03-231-1/+1
* | | | | | git: make sure to close the network streamCarlos Martín Nieto2015-03-211-0/+1
| |_|_|_|/ |/| | | |
* | | | | mkdir-ext: Retry lstat on EEXIST racevmg/mkdir-extVicent Marti2015-03-191-5/+14
* | | | | Merge pull request #2996 from ethomson/dll_commentsCarlos Martín Nieto2015-03-191-2/+6
|\ \ \ \ \
| * | | | | win32 resource: allow custom comments field in DLLEdward Thomson2015-03-181-2/+6
* | | | | | Merge pull request #2967 from jacquesg/merge-whitespaceEdward Thomson2015-03-182-6/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Added options to enable patience and minimal diff driversJacques Germishuys2015-03-161-0/+6
| * | | | | Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys2015-03-162-8/+8
| * | | | | Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-161-2/+2
| * | | | | Allow for merges with whitespace discrepanciesJacques Germishuys2015-03-162-4/+15
| | |_|/ / | |/| | |
* | | | | Merge pull request #2955 from git-up/update_tips_fixesCarlos Martín Nieto2015-03-182-13/+18
|\ \ \ \ \
| * | | | | Fixed active refspecs not reset by git_remote_upload()Pierre-Olivier Latour2015-03-111-0/+4
| * | | | | Fixed update_tips callback called for failed pushed referencesPierre-Olivier Latour2015-03-111-13/+14
* | | | | | Merge remote-tracking branch 'ethomson/submodule_8dot3'Carlos Martín Nieto2015-03-183-61/+167
|\ \ \ \ \ \
| * | | | | | repository: Introduce "reserved names"Edward Thomson2015-02-273-61/+166
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #2983 from jeffhostetler/jeffhostetler/perf_merge_lazy_bin...Edward Thomson2015-03-172-9/+19
|\ \ \ \ \ \
| * | | | | | PERF: In MERGE, lazily compute is_binaryJeff Hostetler2015-03-162-9/+19
| | |_|/ / / | |/| | | |
* | | | | | Initialize refs vector in git_remote_update_tips().Sebastian Bauer2015-03-171-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge pull request #2962 from libgit2/cmn/reflog-annotatedEdward Thomson2015-03-174-10/+98
|\ \ \ \ \
| * | | | | annotated_commit: provide a constructor from a revspecCarlos Martín Nieto2015-03-161-0/+28
| * | | | | Add annotated commit versions of reflog-modifying functionsCarlos Martín Nieto2015-03-163-10/+70
| |/ / / /
* | | | | Merge pull request #2972 from libgit2/cmn/pack-objects-walkEdward Thomson2015-03-179-37/+275
|\ \ \ \ \
| * | | | | local: let the packbuilder perform smarter object insertioncmn/pack-objects-walkCarlos Martín Nieto2015-03-111-32/+10
| * | | | | pack-objects: fill a packbuilder from a walkCarlos Martín Nieto2015-03-112-1/+252
| * | | | | Reorder some khash declarationsCarlos Martín Nieto2015-03-117-4/+13
* | | | | | Merge pull request #2982 from libgit2/cmn/stream-check-ecEdward Thomson2015-03-172-1/+7
|\ \ \ \ \ \
| * | | | | | http: do not try to use the cert callback on unencrypted streamscmn/stream-check-ecCarlos Martín Nieto2015-03-162-1/+7
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2977 from pks-t/submodule-sync-url-fixEdward Thomson2015-03-171-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix git_submodule_sync writing URL to wrong key.Patrick Steinhardt2015-03-121-2/+2
* | | | | | Merge pull request #2975 from git-up/diff_index_retainCarlos Martín Nieto2015-03-151-2/+1
|\ \ \ \ \ \
| * | | | | | Avoid retaining / releasing the index more than necessary when GIT_DIFF_UPDAT...Pierre-Olivier Latour2015-03-111-2/+1
| |/ / / / /
* | | | | | indexer: bring back the error message on duplcate commitsCarlos Martín Nieto2015-03-131-0/+7
* | | | | | indexer: don't worry about duplicate objectsCarlos Martín Nieto2015-03-131-2/+2
* | | | | | indexer: set an error message on duplicate objects in packCarlos Martín Nieto2015-03-131-0/+1
* | | | | | Merge pull request #2973 from libgit2/cmn/local-pack-threadingEdward Thomson2015-03-121-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | local: create pack with multiple threadscmn/local-pack-threadingCarlos Martín Nieto2015-03-111-0/+3
* | | | | | Merge commit 'refs/pull/2879/head' of ssh://github.com/libgit2/libgit2Carlos Martín Nieto2015-03-111-8/+52
|\ \ \ \ \ \ | |/ / / / / |/| | | | |