summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update core.autocrlf = true behaviortopic/CRLF_blob_filtered_contentRussell Belfer2013-10-283-23/+7
* Add clar test to help troubleshooting libgit2/libgit2sharp#543nulltoken2013-10-251-0/+25
* Merge pull request #1907 from nikai3d/patch-1Vicent Martí2013-10-241-3/+3
|\
| * fix typos in README.mdNicolas Kaiser2013-10-241-3/+3
|/
* Really fix the pc fileCarlos Martín Nieto2013-10-231-2/+8
* Merge pull request #1905 from libgit2/cmn/list-depsVicent Martí2013-10-233-2/+28
|\
| * README: add a note about the optional dependenciesCarlos Martín Nieto2013-10-231-0/+11
| * Set the correct dependencies in the pkg-config fileCarlos Martín Nieto2013-10-232-2/+17
* | Merge pull request #1906 from libgit2/cmn/net-cb-errorsVicent Martí2013-10-233-3/+6
|\ \
| * | transport: let the progress output return an errorCarlos Martín Nieto2013-10-233-3/+6
|/ /
* | Merge pull request #1897 from libgit2/split-patch-from-diffVicent Martí2013-10-2236-1757/+1860
|\ \ | |/ |/|
| * Fix typoRussell Belfer2013-10-221-1/+1
| * Implement patience and minimal diff flagsRussell Belfer2013-10-213-1/+56
| * Fix warnings for win64Russell Belfer2013-10-211-5/+5
| * Create git_diff_line and extend git_diff_hunkRussell Belfer2013-10-2114-418/+360
| * Tweak to git_diff_delta structure for nfilesRussell Belfer2013-10-213-22/+32
| * Diff API cleanupRussell Belfer2013-10-1521-470/+532
| * Rename diff objects and split patch.hRussell Belfer2013-10-1136-1023/+1057
* | Implement `git_odb_object_dup`Vicent Marti2013-10-222-0/+21
* | Merge pull request #1903 from ethomson/sshVicent Martí2013-10-214-22/+39
|\ \
| * | Allowed credential types should be a bitfieldEdward Thomson2013-10-214-22/+39
|/ /
* | Merge pull request #1900 from haneefmubarak/patch-1Vicent Martí2013-10-181-13/+13
|\ \
| * | slightly clarified the "license" portion of `README.md" + formatting all overHaneef Mubarak2013-10-171-1/+1
| * | slightly clarified the "license" portion of `README.md" + formatting all overHaneef Mubarak2013-10-171-1/+1
| * | slightly clarified the "license" portion of `README.md" + formatting all overHaneef Mubarak2013-10-171-13/+13
|/ /
* | Merge pull request #1702 from ethomson/checkout_mergeVicent Martí2013-10-1611-33/+1982
|\ \
| * | Move path prefixed help to path.hEdward Thomson2013-10-162-38/+41
| * | Move functions in checkout_conflicts to checkout.cEdward Thomson2013-10-163-729/+696
| * | Two-step conflict checkout (load / perform)Edward Thomson2013-10-164-71/+234
| * | Honor UPDATE_ONLY bit when checking out conflictsEdward Thomson2013-10-164-5/+68
| * | Fix warning, fix memory leakEdward Thomson2013-10-161-8/+9
| * | Don't overwrite ~ files checking out conflictsEdward Thomson2013-10-162-30/+201
| * | Get rid of some quick hacksEdward Thomson2013-10-161-27/+21
| * | checkout rename conflictsEdward Thomson2013-10-162-2/+381
| * | Prevent checkout_tree when conflicts exist, clear NAME on checkout treeEdward Thomson2013-10-162-0/+108
| * | checkout (from index) can write conflictsEdward Thomson2013-10-166-47/+687
| * | tests for checkout index with conflictsEdward Thomson2013-10-164-0/+460
|/ /
* | Merge pull request #1562 from libgit2/cmn/refs-namespace-lookupVicent Martí2013-10-112-1/+19
|\ \
| * | futils: return GIT_ENOTFOUND when trying to read a directoryCarlos Martín Nieto2013-10-112-1/+19
* | | Merge pull request #1898 from arthurschreiber/patch-2Ben Straub2013-10-101-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix a typo in the rpm build instructions.Arthur Schreiber2013-10-111-1/+1
|/ /
* | After iconv init reset ref normalize errorRussell Belfer2013-10-091-0/+1
* | Merge pull request #1886 from libgit2/precompose-utf8Vicent Martí2013-10-0852-537/+954
|\ \
| * | Rename new fn to git_repository_reinit_filesystemRussell Belfer2013-10-085-11/+12
| * | Make reference lookups apply precomposeunicodeRussell Belfer2013-10-089-64/+87
| * | Case sensitivity issues on LinuxRussell Belfer2013-10-082-8/+9
| * | More filemode cleanups for FAT on MacOSRussell Belfer2013-10-0821-201/+236
| * | Add git_repository_reset_filesystem and fix testsRussell Belfer2013-10-049-53/+167
| * | More cleanups to remove WIN assumptionsRussell Belfer2013-10-033-25/+22
| * | Update repo init with fewer platform assumptionsRussell Belfer2013-10-032-60/+66