summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Misc cleanupsRussell Belfer2014-01-302-23/+25
* Make submodule fetchRecurse match other optionsRussell Belfer2014-01-302-2/+10
* Some missing oid to id renamesRussell Belfer2014-01-301-19/+22
* Add `git_graph_descendant_of`.Arthur Schreiber2014-01-281-0/+14
* Merge pull request #2066 from libgit2/rb/builtin-diff-driversVicent Marti2014-01-273-56/+359
|\
| * Add PHP tests and fix bug in PHP builtin driverRussell Belfer2014-01-271-1/+1
| * Update Javascript userdiff driver and testsRussell Belfer2014-01-272-3/+4
| * Got permission from Gustaf for userdiff patternsRussell Belfer2014-01-271-0/+4
| * Add PHP and Javascript diff driversRussell Belfer2014-01-241-0/+16
| * Permission for Git code from a couple moreRussell Belfer2014-01-241-0/+26
| * Got some permission to use userdiff patternsRussell Belfer2014-01-242-38/+165
| * Implement matched pattern extract for fn headersRussell Belfer2014-01-241-3/+8
| * Import git drivers and test HTML driverRussell Belfer2014-01-241-16/+43
| * Initial take on builtin drivers with multilineRussell Belfer2014-01-242-43/+140
* | Merge pull request #2075 from libgit2/cmn/leftover-oidVicent Marti2014-01-2720-133/+133
|\ \
| * | merge: rename _oid() -> id()Carlos Martín Nieto2014-01-251-3/+3
| * | diff: change id abbrev option's name to id_abbrevCarlos Martín Nieto2014-01-251-2/+2
| * | diff: rename the file's 'oid' to 'id'Carlos Martín Nieto2014-01-2511-74/+74
| * | tree: remove legacy 'oid' namingCarlos Martín Nieto2014-01-251-3/+3
| * | commit: remvoe legacy 'oid' namingCarlos Martín Nieto2014-01-251-2/+2
| * | index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-2512-59/+59
| * | note: rename the id getter to git_note_id()Carlos Martín Nieto2014-01-242-4/+4
| |/
* | refspec: move to git_buf for outputting stringsCarlos Martín Nieto2014-01-276-79/+11
* | messsage: use git_buf in prettify()Carlos Martín Nieto2014-01-271-27/+3
* | config: use git_buf for returning pathsCarlos Martín Nieto2014-01-273-54/+9
* | branch: move to git_buf when outputting newly-allocated stringsCarlos Martín Nieto2014-01-271-72/+26
* | repository: move to use a git_buf for outputting stringsCarlos Martín Nieto2014-01-271-32/+9
* | Make sure git_remote_dup copies a remote's refspecs correctly.Arthur Schreiber2014-01-261-8/+26
* | Add some missing const declarations.Arthur Schreiber2014-01-261-7/+7
* | 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-261-11/+37
|\ \ | |/ |/|
| * Factor out code to convert local "url" into a path.Graham Dennis2014-01-191-20/+28
| * Fix local push to file:// URL.Graham Dennis2014-01-181-1/+19
* | Merge pull request #2074 from linquize/pack-filename-sha1Vicent Marti2014-01-232-6/+0
|\ \
| * | Drop parsing pack filename SHA1 part, no one cares the filenameLinquize2014-01-232-6/+0
* | | Merge pull request #2073 from ethomson/zerobytesVicent Marti2014-01-221-1/+1
|\ \ \
| * | | Sometimes a zero byte file is just a zero byte fileEdward Thomson2014-01-221-1/+1
* | | | Plug a small memory leakBen Straub2014-01-221-1/+4
* | | | Summarize empty messagesEdward Thomson2014-01-221-1/+4
|/ / /
* | | Preserve tree filemode in index during checkoutEdward Thomson2014-01-221-2/+1
* | | Drop git_patch_to_strNicolas Hake2014-01-221-18/+0
* | | Expose patch serialization to git_bufNicolas Hake2014-01-221-2/+10
* | | Merge submodulesEdward Thomson2014-01-202-6/+29
* | | Support union mergesEdward Thomson2014-01-201-0/+2
* | | Remove the "merge none" flagEdward Thomson2014-01-201-11/+6
* | | Load merge.conflictstyle setting from configEdward Thomson2014-01-201-0/+23
* | | Introduce diff3 mode for checking out conflictsEdward Thomson2014-01-204-6/+35
* | | Don't try to merge binary filesEdward Thomson2014-01-203-2/+90
* | | merge_file should use more aggressive levelsEdward Thomson2014-01-204-13/+32
View Lorry Controller Status