summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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-1857-17/+261
|\ \ | |/ |/|
| * Added changelog entries for whitespace and patience merges.Jacques Germishuys2015-03-171-0/+12
| * Added options to enable patience and minimal diff driversJacques Germishuys2015-03-162-0/+12
| * Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys2015-03-165-35/+23
| * Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-166-12/+12
| * Added tests to merge files and branches with whitespace problems and fixesJacques Germishuys2015-03-1649-0/+198
| * Allow for merges with whitespace discrepanciesJacques Germishuys2015-03-163-4/+38
* | Merge pull request #2993 from ethomson/clar_updateCarlos Martín Nieto2015-03-181-1/+1
|\ \
| * | clar: update to 08f434dEdward Thomson2015-03-171-1/+1
* | | 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-184-61/+275
|\ \ \ \
| * | | | repository: Introduce "reserved names"Edward Thomson2015-02-274-61/+274
* | | | | Merge pull request #2985 from claudiuolteanu/patch-1Edward Thomson2015-03-171-1/+1
|\ \ \ \ \
| * | | | | Lower case the include directive of windows headerClaudiu Olteanu2015-03-161-1/+1
| | |_|_|/ | |/| | |
* | | | | 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
| |/ / / /
* | | | | Merge pull request #2991 from sba1/fix-uninitialized-data-access-remote-updat...Edward Thomson2015-03-171-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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-1714-27/+247
|\ \ \ \
| * | | | CHANGELOG: add notes about the annotated ref-modifying functionscmn/reflog-annotatedCarlos Martín Nieto2015-03-161-1/+14
| * | | | Add tests for the annotated versions of ref-modifying functionsCarlos Martín Nieto2015-03-165-16/+66
| * | | | annotated_commit: provide a constructor from a revspecCarlos Martín Nieto2015-03-162-0/+45
| * | | | Add annotated commit versions of reflog-modifying functionsCarlos Martín Nieto2015-03-166-10/+122
| |/ / /
* | | | Merge pull request #2972 from libgit2/cmn/pack-objects-walkEdward Thomson2015-03-1710-37/+288
|\ \ \ \
| * | | | 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-113-1/+265
| * | | | Reorder some khash declarationsCarlos Martín Nieto2015-03-117-4/+13
* | | | | Merge pull request #2982 from libgit2/cmn/stream-check-ecEdward Thomson2015-03-173-1/+14
|\ \ \ \ \
| * | | | | http: do not try to use the cert callback on unencrypted streamscmn/stream-check-ecCarlos Martín Nieto2015-03-162-1/+7
| * | | | | Add failing test for cert callback with non-ecrypted streamCarlos Martín Nieto2015-03-161-0/+7
| | |/ / / | |/| | |
* | | | | Merge pull request #2977 from pks-t/submodule-sync-url-fixEdward Thomson2015-03-172-5/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix git_submodule_sync writing URL to wrong key.Patrick Steinhardt2015-03-122-5/+5
* | | | | 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
* | | | | Put back the number of expected references to 6 from the test repoCarlos Martín Nieto2015-03-131-3/+3
* | | | | Merge pull request #2973 from libgit2/cmn/local-pack-threadingEdward Thomson2015-03-122-0/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | local: create pack with multiple threadscmn/local-pack-threadingCarlos Martín Nieto2015-03-112-0/+6
* | | | | Merge commit 'refs/pull/2879/head' of ssh://github.com/libgit2/libgit2Carlos Martín Nieto2015-03-114-8/+209
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add API to add a memory buffer to an indexDamien PROFETA2015-02-254-8/+209
* | | | | Merge pull request #2969 from adrienthebo/remote_add_invalid_refspecCarlos Martín Nieto2015-03-111-0/+3
|\ \ \ \ \
| * | | | | refspec: set err message on invalid refspecAdrien Thebo2015-03-101-0/+3
* | | | | | Merge pull request #2970 from ethomson/inmemory_bareCarlos Martín Nieto2015-03-112-1/+34
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
View Lorry Controller Status