summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-201-38/+26
* Remove fastforward / uptodate from `git_merge`Edward Thomson2014-03-202-85/+25
* Add `git_merge_status` to provide info about an upcoming mergeEdward Thomson2014-03-201-9/+74
* Introduce git_merge_file for consumersEdward Thomson2014-03-206-206/+243
* reflog: handle symref chainsCarlos Martín Nieto2014-03-191-3/+33
* reflog: handle the birth of a branchCarlos Martín Nieto2014-03-191-18/+24
* reflog: simplify the append logicCarlos Martín Nieto2014-03-191-22/+7
* refdb: don't update when there's no needCarlos Martín Nieto2014-03-191-0/+17
* reflog: more comprehensive HEAD testsCarlos Martín Nieto2014-03-181-4/+4
* Merge pull request #2189 from Aimeast/octopusVicent Marti2014-03-181-0/+25
|\
| * Implement git_merge_base_octopusAimeast2014-03-181-0/+25
* | Merge pull request #2192 from phkelley/developmentVicent Marti2014-03-181-19/+102
|\ \ | |/ |/|
| * Seamless support for NTLM/Kerberos auth on WindowsPhilip Kelley2014-03-181-19/+102
* | refs: append to the HEAD reflog when updating the current branchCarlos Martín Nieto2014-03-171-21/+84
* | branch: constness fixesCarlos Martín Nieto2014-03-172-2/+2
|/
* Fix pqueue sort boundary condition bugRussell Belfer2014-03-121-1/+1
* MSVC is sillyCarlos Martín Nieto2014-03-101-2/+2
* Merge pull request #2175 from Yogu/submodule-resolve-urlVicent Marti2014-03-101-10/+20
|\
| * Add git_submodule_resolve_url()Jan Melcher2014-03-101-10/+20
* | corrected typo in error messageBrendan Forster2014-03-101-1/+1
|/
* Merge pull request #2028 from libgit2/options-namesVicent Marti2014-03-076-31/+31
|\
| * git_revert_opts -> git_revert_optionsoptions-namesBen Straub2014-03-061-12/+12
| * git_checkout_opts -> git_checkout_optionsBen Straub2014-03-065-19/+19
* | 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
| |/
* | Plug a few leaks in the testsCarlos Martín Nieto2014-03-072-1/+5
* | 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
|/
* Added function-based initializers for every options struct.Matthew Bowen2014-03-0514-0/+190
* Merge pull request #2159 from libgit2/rb/odb-exists-prefixVicent Marti2014-03-064-10/+140
|\
| * 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-041-0/+43
| * Add exists_prefix to ODB backend and ODB APIRussell Belfer2014-03-043-4/+98
* | 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-051-6/+12
|\ \ \ | |/ / |/| |
| * | ODB writing fails gracefully when unsupportedEdward Thomson2014-03-051-6/+12
* | | Fixed missing error check on call to git_remote_download in git_remote_fetch....Brian Lambert2014-03-051-2/+5
* | | Merge pull request #2157 from libgit2/cmn/write-object-memVicent Marti2014-03-041-10/+17
|\ \ \ | |_|/ |/| |
| * | pack-objects: free memory safelyCarlos Martín Nieto2014-03-041-10/+17
* | | Remove ignored files from the working directory if they were stashedJacques Germishuys2014-03-041-2/+7
* | | Merge pull request #2141 from ravselj/developmentVicent Marti2014-03-033-2/+9
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'remotes/upstream/development' into developmentMiha2014-03-035-163/+155
| |\ \
| * | | - need_pack was not set to 0 when local fetch was already present causing ne...Miha2014-02-251-1/+3
| * | | - BUGFIX #2133 (@fourplusone) in smart_protocol.cMiha2014-02-252-1/+6
* | | | features: Rename `_HAS_` to `_FEATURE_`vmg/featuresVicent Marti2014-03-031-3/+3
* | | | caps: Rename to features to avoid confusionVicent Marti2014-03-031-4/+4
| |/ / |/| |
* | | Merge pull request #2144 from linquize/branch-f-currentBen Straub2014-03-021-0/+13
|\ \ \
View Lorry Controller Status