summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | |_|/ / |/| | |
| * | | pack-objects: free memory safelyCarlos Martín Nieto2014-03-041-10/+17
* | | | Merge pull request #2155 from jacquesg/stash-save-remove-ignoredRussell Belfer2014-03-042-2/+9
|\ \ \ \
| * | | | Remove ignored files from the working directory if they were stashedJacques Germishuys2014-03-042-2/+9
|/ / / /
* | | | Merge pull request #2148 from fourplusone/patch-1Vicent Marti2014-03-031-0/+15
|\ \ \ \
| * | | | Added a test, that fails for #2133Matthias Bartelmeß2014-03-031-0/+15
|/ / / /
* | | | Merge pull request #2141 from ravselj/developmentVicent Marti2014-03-039-7/+19
|\ \ \ \ | |/ / / |/| | |
| * | | - examples CMakeLists.txt reverted to previous stateMiha Ravšelj2014-03-031-5/+1
| * | | cmake examples change so that general.c is off by defaultMiha2014-03-032-2/+6
| * | | - CMakeLists.txt small fixMiha2014-03-031-2/+1
| * | | - general.c reverted to original( before pr state )Miha2014-03-031-39/+43
| * | | Merge remote-tracking branch 'remotes/upstream/development' into developmentMiha2014-03-0317-356/+462
| |\ \ \
| * | | | - 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-259-50/+57
* | | | | Merge pull request #2151 from arthurschreiber/patch-3Vicent Marti2014-03-031-1/+1
|\ \ \ \ \
| * | | | | Fix the description for `GIT_FEATURE_SSH`.Arthur Schreiber2014-03-031-1/+1
|/ / / / /
* | | | | Merge pull request #2150 from libgit2/vmg/featuresVicent Marti2014-03-033-21/+26
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | features: Rename `_HAS_` to `_FEATURE_`vmg/featuresVicent Marti2014-03-033-16/+16
| * | | | caps: Rename the enum name too!Vicent Marti2014-03-031-1/+1
| * | | | caps: Rename to features to avoid confusionVicent Marti2014-03-033-20/+25
|/ / / /
* | | | Merge pull request #2144 from linquize/branch-f-currentBen Straub2014-03-022-0/+32
|\ \ \ \
| * | | | Add unit test to show git_branch_create() fails if attempt to force create cu...Linquize2014-03-021-0/+19
| * | | | Do not allow git_branch_create() to force update branchLinquize2014-02-271-0/+13
* | | | | Merge pull request #2143 from libgit2/rb/projectsVicent Marti2014-03-013-31/+103
|\ \ \ \ \
| * | | | | Add project list and update readmeRussell Belfer2014-02-263-31/+103
| | |/ / / | |/| | |
* | | | | Merge pull request #2146 from libgit2/rb/diff-b2bVicent Marti2014-02-287-318/+300
|\ \ \ \ \
| * | | | | Add buffer to buffer diff and patch APIsRussell Belfer2014-02-276-311/+289
| * | | | | Fix warnings and code style issuesRussell Belfer2014-02-271-7/+11
|/ / / / /
* | | | | Merge pull request #2137 from jru/blame-first-parentBen Straub2014-02-264-2/+27
|\ \ \ \ \