summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update behavior for untracked sub-reposRussell Belfer2014-03-256-23/+82
* Merge pull request #2201 from ethomson/gitbuf_test_fixRussell Belfer2014-03-241-1/+1
|\
| * env test needs to deref git_buf's ptrEdward Thomson2014-03-241-1/+1
|/
* Merge pull request #2183 from ethomson/merge_refactorVicent Marti2014-03-2429-999/+1092
|\
| * UNBORN implies FAST_FORWARDEdward Thomson2014-03-203-4/+5
| * Introduce GIT_MERGE_ANALYSIS_UNBORNEdward Thomson2014-03-203-14/+52
| * git_merge_status -> git_merge_analysisEdward Thomson2014-03-203-37/+41
| * Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-2011-239/+39
| * Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-2017-75/+75
| * Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-2011-116/+75
| * Remove fastforward / uptodate from `git_merge`Edward Thomson2014-03-204-189/+73
| * Add `git_merge_status` to provide info about an upcoming mergeEdward Thomson2014-03-205-157/+204
| * Introduce git_merge_file for consumersEdward Thomson2014-03-2013-280/+640
* | Merge pull request #2200 from libgit2/cmn/opts-bufVicent Marti2014-03-243-16/+25
|\ \
| * | opts: bits are not bytesCarlos Martín Nieto2014-03-241-1/+1
| * | settings: use git_buf for returning stringsCarlos Martín Nieto2014-03-243-15/+24
|/ /
* | Merge pull request #2197 from linquize/assert-wrongVicent Marti2014-03-211-1/+1
|\ \
| * | 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
| |/
* | Merge pull request #2194 from libgit2/cmn/reflog-bareVicent Marti2014-03-202-13/+104
|\ \ | |/ |/|
| * reflog: remove some dead codeCarlos Martín Nieto2014-03-201-3/+0
| * reflog: follow core.logallrefupdatesCarlos Martín Nieto2014-03-202-10/+104
|/
* Merge pull request #2193 from libgit2/cmn/reflog-HEADVicent Marti2014-03-193-37/+297
|\
| * reflog: handle symref chainsCarlos Martín Nieto2014-03-192-3/+84
| * reflog: handle the birth of a branchCarlos Martín Nieto2014-03-192-18/+72
| * 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-193-0/+68
| * reflog: more comprehensive HEAD testsCarlos Martín Nieto2014-03-182-4/+76
|/
* Merge pull request #2189 from Aimeast/octopusVicent Marti2014-03-183-2/+105
|\
| * Implement git_merge_base_octopusAimeast2014-03-183-2/+105
* | Merge pull request #2192 from phkelley/developmentVicent Marti2014-03-182-20/+104
|\ \ | |/ |/|
| * Seamless support for NTLM/Kerberos auth on WindowsPhilip Kelley2014-03-182-20/+104
* | Merge pull request #2190 from libgit2/cmn/current-branch-reflogVicent Marti2014-03-189-56/+124
|\ \ | |/ |/|
| * refs: append to the HEAD reflog when updating the current branchCarlos Martín Nieto2014-03-175-31/+120
| * repo: remove test which deletes HEADCarlos Martín Nieto2014-03-171-21/+0
| * branch: constness fixesCarlos Martín Nieto2014-03-174-4/+4
* | Merge pull request #2191 from libgit2/cmn/projectsRussell Belfer2014-03-171-0/+9
|\ \ | |/ |/|
| * Add a few projects to the listCarlos Martín Nieto2014-03-171-0/+9
|/
* refs: fix copy-paste doc errorCarlos Martín Nieto2014-03-131-1/+1
* Merge pull request #2184 from libgit2/rb/fix-revwalk-order-regressionEdward Thomson2014-03-123-1/+91
|\
| * Fix pqueue sort boundary condition bugRussell Belfer2014-03-123-1/+91
|/
* MSVC is sillyCarlos Martín Nieto2014-03-101-2/+2
* Merge pull request #2175 from Yogu/submodule-resolve-urlVicent Marti2014-03-102-10/+30
|\
| * Add git_submodule_resolve_url()Jan Melcher2014-03-102-10/+30
* | Merge pull request #2177 from shiftkey/typo-fixPaul Betts2014-03-091-1/+1
|\ \ | |/ |/|
| * corrected typo in error messageBrendan Forster2014-03-101-1/+1
|/
* Merge pull request #2170 from ethomson/clarVicent Marti2014-03-072-4/+4
|\
| * Update clar to e1990d6Edward Thomson2014-03-072-4/+4
|/
* Merge pull request #2028 from libgit2/options-namesVicent Marti2014-03-0727-159/+184
|\