summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2291 from ethomson/patch_binaryVicent Marti2014-04-231-0/+4
|\
| * patch: emit binary patches (optionally)Edward Thomson2014-04-221-0/+4
* | Use git_diff_get_stats in example/diff + refactorRussell Belfer2014-04-221-1/+3
* | Some doc and examples/diff.c changesRussell Belfer2014-04-221-18/+11
* | transports: allow the creds callback to say it doesn't existCarlos Martín Nieto2014-04-221-0/+3
* | remote: provide read access to the callback structureCarlos Martín Nieto2014-04-221-0/+11
|/
* Replace void * with proper callback typesJacques Germishuys2014-04-181-2/+2
* Make git_cred_ssh_custom_new() naming more consistentJacques Germishuys2014-04-181-5/+5
* Introduce git_cred_ssh_interactive_new()Jacques Germishuys2014-04-181-0/+30
* Fix leak in git_index_conflict_cleanupRussell Belfer2014-04-171-7/+12
* Add public diff print helpersRussell Belfer2014-04-171-0/+63
* Some index internals refactoringRussell Belfer2014-04-171-4/+11
* Merge pull request #2261 from jacquesg/format-patchVicent Marti2014-04-162-3/+176
|\
| * Introduce git_diff_format_email and git_diff_commit_as_emailJacques Germishuys2014-04-151-0/+88
| * Introduce git_diff_get_stats, git_diff_stats_files_changed, git_diff_stats_in...Jacques Germishuys2014-04-151-0/+85
| * Fix const-correctness of git_patch_get_delta, git_patch_num_hunks, git_patch_...Jacques Germishuys2014-04-111-3/+3
* | Add GIT_BRANCH_ALL to git_branch_t enumSven Strickroth2014-04-162-1/+2
* | Added cherry-pick supportJacques Germishuys2014-04-143-0/+90
|/
* Const correctness!Jacques Germishuys2014-04-036-12/+15
* Give the correct name for the function in the doc.fix-memory-index-doc-commentRob Rix2014-04-021-2/+2
* 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 backendvmg/mempackVicent Marti2014-03-262-0/+96
* | Merge pull request #2206 from libgit2/cmn/inmemory-swap-orderVicent Marti2014-04-011-7/+7
|\ \
| * | remote: rename inmemory to anonymous and swap url and fetch orderCarlos Martín Nieto2014-04-011-7/+7
| |/
* | 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
* | Merge pull request #2204 from libgit2/rb/submodule-reference-countingVicent Marti2014-03-261-14/+30
|\ \ | |/ |/|
| * Make submodules externally refcountedRussell Belfer2014-03-251-14/+30
* | Merge pull request #2181 from anuraggup/hide_cbEdward Thomson2014-03-251-0/+24
|\ \ | |/ |/|
| * 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
|\ \ | |/ |/|
| * 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
* | settings: use git_buf for returning stringsCarlos Martín Nieto2014-03-241-5/+4
|/
* Merge pull request #2189 from Aimeast/octopusVicent Marti2014-03-181-1/+16
|\
| * 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 WindowsPhilip Kelley2014-03-181-1/+2