summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* More index collision testsEdward Thomson2014-01-291-0/+64
* index: Implement folder-file checksVicent Marti2014-01-291-52/+50
* index: Compare with given lenVicent Marti2014-01-293-13/+127
* Add test for blob/tree name collisions in indexRussell Belfer2014-01-291-0/+42
* Merge pull request #2086 from ethomson/fixupVicent Marti2014-01-291-1/+1
|\
| * Don't strcmp a git_buf, strcmp its char *Edward Thomson2014-01-291-1/+1
|/
* Merge pull request #2083 from arthurschreiber/arthur/add-git_commit_descendan...Vicent Marti2014-01-283-0/+75
|\
| * Add `git_graph_descendant_of`.Arthur Schreiber2014-01-283-0/+75
|/
* Merge pull request #2066 from libgit2/rb/builtin-diff-driversVicent Marti2014-01-2731-85/+1281
|\
| * Add PHP tests and fix bug in PHP builtin driverRussell Belfer2014-01-2714-4/+205
| * Update Javascript userdiff driver and testsRussell Belfer2014-01-2726-20/+430
| * Got permission from Gustaf for userdiff patternsRussell Belfer2014-01-272-0/+5
| * Add PHP and Javascript diff driversRussell Belfer2014-01-241-0/+16
| * Move userdiff tests to be data drivenRussell Belfer2014-01-2422-47/+239
| * Permission for Git code from a couple moreRussell Belfer2014-01-242-0/+28
| * Got some permission to use userdiff patternsRussell Belfer2014-01-243-38/+170
| * Update all tests for new pattern extractionRussell Belfer2014-01-241-4/+4
| * Implement matched pattern extract for fn headersRussell Belfer2014-01-242-5/+10
| * Fix filemode updating in diff textRussell Belfer2014-01-241-7/+15
| * Import git drivers and test HTML driverRussell Belfer2014-01-242-40/+142
| * Initial take on builtin drivers with multilineRussell Belfer2014-01-242-43/+140
* | Merge pull request #2075 from libgit2/cmn/leftover-oidVicent Marti2014-01-2753-277/+277
|\ \
| * | merge: rename _oid() -> id()Carlos Martín Nieto2014-01-255-56/+56
| * | diff: change id abbrev option's name to id_abbrevCarlos Martín Nieto2014-01-252-3/+3
| * | diff: rename the file's 'oid' to 'id'Carlos Martín Nieto2014-01-2514-94/+94
| * | tree: remove legacy 'oid' namingCarlos Martín Nieto2014-01-252-6/+6
| * | commit: remvoe legacy 'oid' namingCarlos Martín Nieto2014-01-252-3/+3
| * | index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-2534-118/+118
| * | note: rename the id getter to git_note_id()Carlos Martín Nieto2014-01-245-11/+11
| |/
* | Merge pull request #2077 from libgit2/cmn/buf-outVicent Marti2014-01-2724-503/+191
|\ \
| * | refspec: move to git_buf for outputting stringsCarlos Martín Nieto2014-01-279-98/+22
| * | messsage: use git_buf in prettify()Carlos Martín Nieto2014-01-274-104/+38
| * | config: use git_buf for returning pathsCarlos Martín Nieto2014-01-274-67/+20
| * | branch: move to git_buf when outputting newly-allocated stringsCarlos Martín Nieto2014-01-275-134/+56
| * | repository: move to use a git_buf for outputting stringsCarlos Martín Nieto2014-01-274-100/+55
* | | Merge pull request #2078 from linquize/msvcVicent Marti2014-01-271-2/+1
|\ \ \
| * | | MSVC doesn't like modern code neitherLinquize2014-01-271-2/+1
* | | | Merge pull request #2079 from linquize/msvc-blame-exampleVicent Marti2014-01-271-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Make blame example compile on MSVCLinquize2014-01-271-0/+5
|/ / /
* | | MSVC doesn't like modern codeCarlos Martín Nieto2014-01-271-1/+2
|/ /
* | Merge pull request #2052 from arthurschreiber/arthur/add-git_remote_dupBen Straub2014-01-263-22/+42
|\ \
| * | Make sure git_remote_dup copies a remote's refspecs correctly.Arthur Schreiber2014-01-263-9/+29
| * | Add some missing const declarations.Arthur Schreiber2014-01-262-13/+13
|/ /
* | Merge pull request #2076 from xtao/fix-zstreamEdward Thomson2014-01-262-5/+6
|\ \
| * | Fix write_object.XTao2014-01-262-5/+6
| |/
* | Merge pull request #2057 from GrahamDennis/local-file-url-push-fixEdward Thomson2014-01-262-11/+77
|\ \ | |/ |/|
| * Factor out code to convert local "url" into a path.Graham Dennis2014-01-191-20/+28
| * Fix a compile warning.Graham Dennis2014-01-181-1/+1
| * Add test for pushing to a local file:// URL.Graham Dennis2014-01-181-0/+40
| * Fix local push to file:// URL.Graham Dennis2014-01-181-1/+19