summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2208 from libgit2/vmg/mempackRussell Belfer2014-04-011-0/+182
|\
| * In-memory packing backendvmg/mempackVicent Marti2014-03-261-0/+182
* | Merge pull request #2226 from libgit2/rb/submodule-sorting-fixEdward Thomson2014-04-014-19/+46
|\ \
| * | CleanupsRussell Belfer2014-03-313-4/+4
| * | Fix submodule sorting in workdir iteratorRussell Belfer2014-03-311-16/+25
| * | Add faster git_submodule__is_submodule checkRussell Belfer2014-03-312-0/+18
* | | Merge pull request #2206 from libgit2/cmn/inmemory-swap-orderVicent Marti2014-04-011-4/+4
|\ \ \
| * | | remote: rename inmemory to anonymous and swap url and fetch orderCarlos Martín Nieto2014-04-011-4/+4
| | |/ | |/|
* | | Merge pull request #2178 from libgit2/rb/fix-short-idEdward Thomson2014-03-311-7/+17
|\ \ \ | |_|/ |/| |
| * | Fix a number of git_odb_exists_prefix bugsRussell Belfer2014-03-101-7/+17
* | | Const up members of git_merge_file_resultEdward Thomson2014-03-311-2/+2
* | | Merge pull request #2222 from ethomson/merge_head_idVicent Marti2014-03-311-0/+8
|\ \ \
| * | | Introduce git_merge_head_idEdward Thomson2014-03-311-0/+8
* | | | Don't reset need_packEtienne Samson2014-03-301-1/+2
|/ / /
* | | Fix memory leak of submodule branch nameRussell Belfer2014-03-271-0/+1
* | | Fix use-after-free in submodule reloadRussell Belfer2014-03-271-3/+6
* | | Fix error when submodule path and name differRussell Belfer2014-03-261-2/+5
* | | Fix segfault if gitmodules is invalidRussell Belfer2014-03-261-2/+3
* | | Free temporary merge indexEdward Thomson2014-03-261-2/+1
* | | Merge pull request #2204 from libgit2/rb/submodule-reference-countingVicent Marti2014-03-265-95/+220
|\ \ \ | |_|/ |/| |
| * | Fix submodule leaks and invalid referencesRussell Belfer2014-03-254-30/+105
| * | Make submodules externally refcountedRussell Belfer2014-03-255-65/+115
* | | Merge pull request #2205 from libgit2/rb/submodule-untracked-vs-ignoredVicent Marti2014-03-262-11/+4
|\ \ \
| * | | Update behavior for untracked sub-reposRussell Belfer2014-03-252-11/+4
| |/ /
* | | clone: don't overwrite original error messageEdward Thomson2014-03-251-0/+5
* | | Merge pull request #2181 from anuraggup/hide_cbEdward Thomson2014-03-252-5/+29
|\ \ \ | |/ / |/| |
| * | Conforming to libgit2 coding style.Anurag Gupta2014-03-241-4/+1
| * | Remove unused push_cb_dataAnurag Gupta2014-03-241-5/+0
| * | Callback to hide commits in revision walker.Anurag Gupta2014-03-242-0/+32
* | | Merge pull request #2183 from ethomson/merge_refactorVicent Marti2014-03-248-414/+403
|\ \ \ | |/ / |/| |
| * | UNBORN implies FAST_FORWARDEdward Thomson2014-03-201-1/+1
| * | Introduce GIT_MERGE_ANALYSIS_UNBORNEdward Thomson2014-03-201-10/+25
| * | git_merge_status -> git_merge_analysisEdward Thomson2014-03-201-5/+5
| * | Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-202-57/+1
| * | Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-203-28/+28
| * | 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
* | | settings: use git_buf for returning stringsCarlos Martín Nieto2014-03-241-6/+14
* | | Fix wrong assertionLinquize2014-03-211-1/+1
* | | Merge pull request #2195 from libgit2/cmn/revwalk-no-hideVicent Marti2014-03-203-5/+22
|\ \ \
| * | | revwalk: don't try to find merge bases when there can be noneCarlos Martín Nieto2014-03-203-5/+22
| |/ /
* | | reflog: remove some dead codeCarlos Martín Nieto2014-03-201-3/+0
* | | reflog: follow core.logallrefupdatesCarlos Martín Nieto2014-03-201-10/+31
|/ /
* | 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