summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* repository: allow the global and system configs to fail loadingcmn/config-ignore-accessCarlos Martín Nieto2014-03-112-3/+22
* config: let the on-disk backend fail to load gracefullyCarlos Martín Nieto2014-03-116-16/+66
* MSVC is sillyCarlos Martín Nieto2014-03-101-2/+2
* Merge pull request #2175 from Yogu/submodule-resolve-urlVicent Marti2014-03-102-10/+30
|\
| * Add git_submodule_resolve_url()Jan Melcher2014-03-102-10/+30
* | Merge pull request #2177 from shiftkey/typo-fixPaul Betts2014-03-091-1/+1
|\ \ | |/ |/|
| * corrected typo in error messageBrendan Forster2014-03-101-1/+1
|/
* Merge pull request #2170 from ethomson/clarVicent Marti2014-03-072-4/+4
|\
| * Update clar to e1990d6Edward Thomson2014-03-072-4/+4
|/
* Merge pull request #2028 from libgit2/options-namesVicent Marti2014-03-0727-159/+184
|\
| * git_revert_opts -> git_revert_optionsoptions-namesBen Straub2014-03-064-29/+29
| * git_checkout_opts -> git_checkout_optionsBen Straub2014-03-0625-131/+156
* | Merge pull request #2153 from mekishizufu/tag_exampleRussell Belfer2014-03-074-2/+320
|\ \
| * | Move all variable declarations to the top of the blockJiri Pospisil2014-03-051-4/+7
| * | Add tag exampleJiri Pospisil2014-03-053-1/+316
| * | Fix typoJiri Pospisil2014-03-051-1/+1
* | | Merge pull request #2167 from mekishizufu/memory_access_fixesVicent Marti2014-03-072-21/+18
|\ \ \
| * | | blame: Fix compare function's data typesJiri Pospisil2014-03-071-6/+9
| * | | git_oid_fromstrn: Simplify the implementation and fix memory access issuesJiri Pospisil2014-03-071-15/+9
* | | | Merge pull request #2169 from libgit2/valgrindVicent Marti2014-03-079-15/+44
|\ \ \ \ | |/ / / |/| | |
| * | | Plug a few leaks in the testsCarlos Martín Nieto2014-03-076-1/+22
| * | | branch: fix leak when checking against HEADCarlos Martín Nieto2014-03-071-5/+11
| * | | commit: simplify and correct refcounting in nth_gen_ancestorCarlos Martín Nieto2014-03-071-9/+8
| * | | local transport: catch double-opensCarlos Martín Nieto2014-03-071-0/+3
|/ / /
* | | Merge pull request #2168 from ethomson/clarVicent Marti2014-03-072-0/+26
|\ \ \ | |_|/ |/| |
| * | Update clar to a0b00f0Edward Thomson2014-03-072-0/+26
|/ /
* | tests: MSVC compatCarlos Martín Nieto2014-03-061-2/+4
* | Merge pull request #2165 from libgit2/revert-1997Vicent Marti2014-03-061-1/+1
|\ \
| * | Revert pull request #1997revert-1997Vicent Marti2014-03-061-1/+1
|/ /
* | Merge pull request #1997 from mgbowen/merge-options-init-fixVicent Marti2014-03-061-1/+1
|\ \
| * | Fix GIT_MERGE_OPTS_INIT on MSVC.Matthew Bowen2013-12-091-1/+1
* | | Merge pull request #2014 from mgbowen/cpp-options-initVicent Marti2014-03-0629-0/+516
|\ \ \
| * | | Added function-based initializers for every options struct.Matthew Bowen2014-03-0529-0/+516
* | | | Merge pull request #2162 from sunheehnus/devBen Straub2014-03-052-3/+51
|\ \ \ \ | |/ / / |/| | |
| * | | Merge completed: resolve the conflict with the upstreamSun He2014-03-0616-30/+309
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #2159 from libgit2/rb/odb-exists-prefixVicent Marti2014-03-0610-16/+234
|\ \ \ \
| * | | | Check short OID len in odb, not in backendsRussell Belfer2014-03-052-10/+3
| * | | | Add git_object_short_id API to get short id stringRussell Belfer2014-03-043-0/+97
| * | | | Add exists_prefix to ODB backend and ODB APIRussell Belfer2014-03-047-10/+138
* | | | | Merge pull request #2164 from libgit2/cmn/refs-delete-iterationVicent Marti2014-03-052-2/+13
|\ \ \ \ \
| * | | | | refdb: catch a directory disappearingCarlos Martín Nieto2014-03-052-2/+13
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2163 from ethomson/nobackend_odb_writeVicent Marti2014-03-052-6/+53
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | ODB writing fails gracefully when unsupportedEdward Thomson2014-03-052-6/+53
* | | | | Merge pull request #2160 from modocache/examples-diff-add-patience-and-minimalVicent Marti2014-03-052-4/+4
|\ \ \ \ \
| * | | | | examples/diff: Add minimal, patience diff options.Brian Gesiak2014-03-052-4/+4
* | | | | | Merge pull request #2161 from softwarenerd/softwarenerdVicent Marti2014-03-051-2/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed missing error check on call to git_remote_download in git_remote_fetch....Brian Lambert2014-03-051-2/+5
|/ / / / /
| | | * | fix the output format of diffSun He2014-03-051-2/+2
| | | * | Add the --shortstat flag to examples/diff.cSun He2014-03-052-3/+51
| |_|/ / |/| | |
* | | | Merge pull request #2157 from libgit2/cmn/write-object-memVicent Marti2014-03-041-10/+17
|\ \ \ \ | |_|/ / |/| | |
View Lorry Controller Status