summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
* Give the correct name for the function in the doc.fix-memory-index-doc-commentRob Rix2014-04-021-2/+2
| | | Per @carlosmn, git_index_add is now named git_index_add_bypath.
* Correct a stale reference to GIT_EBAREINDEXRob Rix2014-04-011-1/+1
|
* Merge pull request #2208 from libgit2/vmg/mempackRussell Belfer2014-04-012-0/+96
|\ | | | | In-memory packing backend
| * In-memory packing backendvmg/mempackVicent Marti2014-03-262-0/+96
| |
* | Merge pull request #2206 from libgit2/cmn/inmemory-swap-orderVicent Marti2014-04-011-7/+7
|\ \ | | | | | | Rename in-memory remote to anonymous and swap url and fetch order
| * | remote: rename inmemory to anonymous and swap url and fetch orderCarlos Martín Nieto2014-04-011-7/+7
| |/ | | | | | | | | | | | | | | | | | | The order in this function is the opposite to what create_with_fetchspec() has, so change this one, as url-then-refspec is what git does. As we need to break compilation and the swap doesn't do that, let's take this opportunity to rename in-memory remotes to anonymous as that's really what sets them apart.
* | Const up members of git_merge_file_resultEdward Thomson2014-03-311-2/+2
| |
* | Introduce git_merge_head_idEdward Thomson2014-03-311-0/+9
| |
* | Fix segfault if gitmodules is invalidRussell Belfer2014-03-261-3/+3
| | | | | | | | | | | | The reload_all call could end up dereferencing a NULL pointer if there was an error while attempting to load the submodules config data (i.e. invalid content in the gitmodules file). This fixes it.
* | Merge pull request #2204 from libgit2/rb/submodule-reference-countingVicent Marti2014-03-261-14/+30
|\ \ | |/ |/| Make submodules externally refcounted
| * Make submodules externally refcountedRussell Belfer2014-03-251-14/+30
| | | | | | | | | | | | | | | | `git_submodule` objects were already refcounted internally in case the submodule name was different from the path at which it was stored. This makes that refcounting externally used as well, so `git_submodule_lookup` and `git_submodule_add_setup` return an object that requires a `git_submodule_free` when done.
* | Merge pull request #2181 from anuraggup/hide_cbEdward Thomson2014-03-251-0/+24
|\ \ | |/ |/| Callback function to hide commit and its parents in revision walker
| * Correcting format of comments in header fileAnurag Gupta2014-03-241-13/+13
| |
| * Unit Tests for hide_cb in revwalkAnurag Gupta2014-03-241-2/+2
| |
| * Callback to hide commits in revision walker.Anurag Gupta2014-03-241-0/+24
| |
* | Merge pull request #2183 from ethomson/merge_refactorVicent Marti2014-03-242-111/+224
|\ \ | |/ |/| Refactor the `git_merge` API
| * UNBORN implies FAST_FORWARDEdward Thomson2014-03-201-2/+2
| |
| * Introduce GIT_MERGE_ANALYSIS_UNBORNEdward Thomson2014-03-201-0/+7
| |
| * git_merge_status -> git_merge_analysisEdward Thomson2014-03-201-10/+13
| |
| * Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-201-60/+4
| |
| * Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-202-16/+16
| |
| * Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-201-28/+4
| |
| * Remove fastforward / uptodate from `git_merge`Edward Thomson2014-03-201-27/+1
| |
| * Add `git_merge_status` to provide info about an upcoming mergeEdward Thomson2014-03-201-0/+40
| |
| * Introduce git_merge_file for consumersEdward Thomson2014-03-201-0/+169
| |
* | opts: bits are not bytesCarlos Martín Nieto2014-03-241-1/+1
| | | | | | | | | | The default cache size is 256 megabytes, not megabits as claimed in the docs.
* | settings: use git_buf for returning stringsCarlos Martín Nieto2014-03-241-5/+4
|/ | | | | This survived the last round of culling, as the signature is only in the comments.
* Merge pull request #2189 from Aimeast/octopusVicent Marti2014-03-181-1/+16
|\ | | | | Implement git_merge_base_octopus
| * Implement git_merge_base_octopusAimeast2014-03-181-1/+16
| |
* | Merge pull request #2192 from phkelley/developmentVicent Marti2014-03-181-1/+2
|\ \ | |/ |/| Seamless support for NTLM/Kerberos auth on Windows
| * Seamless support for NTLM/Kerberos auth on WindowsPhilip Kelley2014-03-181-1/+2
| |
* | branch: constness fixesCarlos Martín Nieto2014-03-172-2/+2
|/
* refs: fix copy-paste doc errorCarlos Martín Nieto2014-03-131-1/+1
|
* Add git_submodule_resolve_url()Jan Melcher2014-03-101-0/+10
|
* Merge pull request #2028 from libgit2/options-namesVicent Marti2014-03-074-29/+29
|\ | | | | Rename options structures
| * git_revert_opts -> git_revert_optionsoptions-namesBen Straub2014-03-061-9/+9
| |
| * git_checkout_opts -> git_checkout_optionsBen Straub2014-03-064-21/+21
| |
* | Merge pull request #2153 from mekishizufu/tag_exampleRussell Belfer2014-03-071-1/+1
|\ \ | |/ |/| Add a tag example
| * Fix typoJiri Pospisil2014-03-051-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.
| * | Fix GIT_MERGE_OPTS_INIT on MSVC.Matthew Bowen2013-12-091-1/+1
| | |
* | | Added function-based initializers for every options struct.Matthew Bowen2014-03-0514-0/+206
| | | | | | | | | | | | The basic structure of each function is courtesy of arrbee.
* | | Add git_object_short_id API to get short id stringRussell Belfer2014-03-041-0/+10
| | | | | | | | | | | | | | | | | | This finds a short id string that will unambiguously select the given object, starting with the core.abbrev length (usually 7) and growing until it is no longer ambiguous.
* | | Add exists_prefix to ODB backend and ODB APIRussell Belfer2014-03-042-5/+18
| |/ |/|
* | Fix the description for `GIT_FEATURE_SSH`.Arthur Schreiber2014-03-031-1/+1
| |
* | features: Rename `_HAS_` to `_FEATURE_`vmg/featuresVicent Marti2014-03-031-7/+7
| |
* | caps: Rename the enum name too!Vicent Marti2014-03-031-1/+1
| |
* | caps: Rename to features to avoid confusionVicent Marti2014-03-031-8/+13
| |
* | Add buffer to buffer diff and patch APIsRussell Belfer2014-02-272-0/+61
| | | | | | | | | | | | | | | | This adds `git_diff_buffers` and `git_patch_from_buffers`. This also includes a bunch of internal refactoring to increase the shared code between these functions and the blob-to-blob and blob-to-buffer APIs, as well as some higher level assert helpers in the tests to also remove redundancy.
View Lorry Controller Status