summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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.
* | Merge pull request #2137 from jru/blame-first-parentBen Straub2014-02-261-0/+3
|\ \ | | | | | | Blame first-parent history
| * | Document enumerator and rewordingJuan Rubén2014-02-241-1/+2
| | |
| * | Add option to limit blame to first parentJuan Rubén2014-02-231-0/+2
| | |
* | | Improve documentation for mergingEdward Thomson2014-02-211-33/+127
| | |
* | | Address PR commentsRussell Belfer2014-02-202-13/+6
| | | | | | | | | | | | | | | | | | | | | * Make GIT_INLINE an internal definition so it cannot be used in public headers * Fix language in CONTRIBUTING * Make index caps API use signed instead of unsigned values
* | | Make git_oid_equal a non-inline APIRussell Belfer2014-02-201-4/+1
|/ /
* | refs: move current_id before the reflog parametersCarlos Martín Nieto2014-02-101-4/+4
| | | | | | | | | | Keep the reflog parameters as the last two, as they're the optional parameters.
* | refs: conditional wording fixupsCarlos Martín Nieto2014-02-101-8/+11
| | | | | | | | | | This addresses arrbee's concerns about wording in the conditional reference udpate functions.
* | Add git_commit_amend APIRussell Belfer2014-02-072-10/+75
| | | | | | | | | | | | | | | | | | This adds an API to amend an existing commit, basically a shorthand for creating a new commit filling in missing parameters from the values of an existing commit. As part of this, I also added a new "sys" API to create a commit using a callback to get the parents. This allowed me to rewrite all the other commit creation APIs so that temporary allocations are no longer needed.
* | Merge pull request #2099 from libgit2/bs/more-reflog-stuffRussell Belfer2014-02-074-5/+39
|\ \ | | | | | | More reflogness
| * | Correct default reflog message for git_remote_fetchBen Straub2014-02-061-1/+2
| | |
| * | Fix terrible indentationBen Straub2014-02-062-2/+2
| | |
| * | Merge remote-tracking branch 'libgit2/development' into bs/more-reflog-stuffBen Straub2014-02-051-6/+12
| |\ \
| * | | Add reflog params to git_repository_detach_headBen Straub2014-02-041-1/+5
| | | |
| * | | Add reflog parameters to remote apisBen Straub2014-02-041-2/+14
| | | | | | | | | | | | Also added a test for git_remote_fetch.
| * | | Add reflog parameters to git_push_update_tipsBen Straub2014-02-041-1/+7
| | | |
View Lorry Controller Status