summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MSVC doesn't like modern code neitherLinquize2014-01-271-2/+1
* 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
* | 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-222-1/+29
|\ \ \
| * | | Sometimes a zero byte file is just a zero byte fileEdward Thomson2014-01-222-1/+29
* | | | Plug a small memory leakBen Straub2014-01-221-1/+4
* | | | Merge pull request #2072 from ethomson/commit_summaryVicent Marti2014-01-222-1/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Summarize empty messagesEdward Thomson2014-01-222-1/+8
|/ / /
* | | Merge pull request #2070 from ethomson/checkout_filemodeVicent Marti2014-01-225-2/+24
|\ \ \
| * | | Preserve tree filemode in index during checkoutEdward Thomson2014-01-225-2/+24
|/ / /
* | | Merge pull request #2069 from isilkor/patch_to_bufVicent Marti2014-01-229-107/+101
|\ \ \
| * | | Drop git_patch_to_strNicolas Hake2014-01-229-118/+94
| * | | Expose patch serialization to git_bufNicolas Hake2014-01-222-2/+20
|/ / /
* | | Merge pull request #2061 from ethomson/merge_improvementsVicent Marti2014-01-2090-247/+836
|\ \ \
| * | | Merge submodulesEdward Thomson2014-01-2048-6/+174
| * | | Support union mergesEdward Thomson2014-01-203-0/+48
| * | | Remove the "merge none" flagEdward Thomson2014-01-205-217/+39
| * | | Load merge.conflictstyle setting from configEdward Thomson2014-01-202-0/+109
| * | | Introduce diff3 mode for checking out conflictsEdward Thomson2014-01-206-7/+90
| * | | Don't try to merge binary filesEdward Thomson2014-01-2013-2/+130
| * | | merge_file should use more aggressive levelsEdward Thomson2014-01-2033-33/+264
|/ / /
* | | Merge pull request #2065 from ethomson/submodule_unmodifiedVicent Marti2014-01-202-1/+19
|\ \ \
| * | | "Uninitialized" submodules are "unmodified"Edward Thomson2014-01-202-1/+19
|/ / /
* | | Merge pull request #2063 from linquize/reflog-msg-nullRussell Belfer2014-01-201-0/+2
|\ \ \
| * | | git_reflog_entry_message can be nullLinquize2014-01-201-0/+2
| |/ /
* | | Merge pull request #2064 from piki/piki/buffer-corner-casesRussell Belfer2014-01-202-3/+37
|\ \ \ | |/ / |/| |
| * | add unit tests for git_buf_join corner casesPatrick Reynolds2014-01-201-0/+31
| * | fix corner cases and an undefined behaviorPatrick Reynolds2014-01-201-3/+6
|/ /
* | Merge pull request #2059 from linquize/git_config_get_crashEdward Thomson2014-01-181-0/+1
|\ \
| * | Fix segfault when calling git_config_get_* functions when a config fails to loadLinquize2014-01-181-0/+1
* | | Merge pull request #2058 from libgit2/rb/gitdir-windows-pathsEdward Thomson2014-01-171-1/+5
|\ \ \ | |_|/ |/| |
| * | Convert gitdir paths to posix on WindowsRussell Belfer2014-01-171-1/+5
|/ /
* | Merge pull request #2055 from arthurschreiber/patch-3Vicent Marti2014-01-161-6/+6
|\ \
| * | Revert a wrong doc change.Arthur Schreiber2014-01-161-1/+1
| * | Fix some documentation issues.Arthur Schreiber2014-01-161-6/+6
|/ /
* | Merge pull request #2044 from libgit2/coverityBen Straub2014-01-164-0/+72
|\ \
| * | Refine build limitationBen Straub2014-01-151-2/+7
| * | Only run coverity on developmentBen Straub2014-01-151-0/+3
| * | Add coverity scan badge to readmeBen Straub2014-01-131-0/+1