summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* - BUGFIX #2133 (@fourplusone) in smart_protocol.cMiha2014-02-259-50/+57
* Merge pull request #2138 from ethomson/sysdirVicent Marti2014-02-2513-355/+396
|\
| * Move system directory cache out of utilsEdward Thomson2014-02-2413-355/+396
* | Merge pull request #2139 from ethomson/va_copy_warningVicent Marti2014-02-2511-16/+2
|\ \ | |/ |/|
| * Remove now-duplicated stdarg.h includeEdward Thomson2014-02-2410-16/+0
| * Include stdarg.h for the va_copy testEdward Thomson2014-02-241-0/+2
|/
* Merge pull request #2134 from libgit2/ben/iccVicent Marti2014-02-244-6/+8
|\
| * Use a portable castBen Straub2014-02-241-2/+2
| * Prevent icc warningBen Straub2014-02-241-1/+3
| * Avoid casting warningBen Straub2014-02-241-2/+2
| * Staticize file-local variablesBen Straub2014-02-242-3/+3
|/
* Merge pull request #2132 from ethomson/merge_docVicent Marti2014-02-241-33/+127
|\
| * Improve documentation for mergingEdward Thomson2014-02-211-33/+127
* | Merge pull request #2130 from worblehat/developmentRussell Belfer2014-02-211-1/+5
|\ \ | |/ |/|
| * Check if librt exists independent of OS, to be able to exclude librt on Andro...Tobias Marquardt2014-02-211-1/+5
* | Merge pull request #2129 from arrbee/rb/c89-or-c99Vicent Marti2014-02-2114-53/+71
|\ \ | |/ |/|
| * Address PR commentsRussell Belfer2014-02-2010-29/+30
| * Clarify C compatibility policyRussell Belfer2014-02-203-21/+36
| * Make git_oid_equal a non-inline APIRussell Belfer2014-02-202-4/+6
|/
* Merge pull request #2124 from libgit2/better-shallow-errorsVicent Marti2014-02-192-2/+11
|\
| * ReadabilityBen Straub2014-02-181-1/+3
| * Improve error propagation in shallow callBen Straub2014-02-182-4/+11
|/
* Merge pull request #2121 from bk2204/ewouldblockVicent Marti2014-02-182-1/+10
|\
| * Check for EWOULDBLOCK as well as EAGAIN on write.brian m. carlson2014-02-162-1/+10
|/
* Merge pull request #2115 from ethomson/crlf_reduxEdward Thomson2014-02-111-1/+2
|\
| * Fix filter test for CRLF->LF issuesEdward Thomson2014-02-111-1/+2
|/
* Merge pull request #2114 from ethomson/crlf_reduxVicent Marti2014-02-121-17/+4
|\
| * Never convert CRLF->LFEdward Thomson2014-02-111-17/+4
|/
* Merge pull request #2110 from libgit2/ed/crlf_inputRussell Belfer2014-02-115-26/+248
|\
| * core.autocrlf=input w/ text=auto attr to workdirEdward Thomson2014-02-091-1/+7
| * Tests for crlf filtering into the repositoryEdward Thomson2014-02-091-0/+136
| * Tests for core.autocrlf and .gitattributesEdward Thomson2014-02-093-25/+104
| * Close files on file diff failureEdward Thomson2014-02-091-0/+1
* | Merge pull request #2111 from libgit2/cmn/cond-fixupsRussell Belfer2014-02-104-23/+25
|\ \ | |/ |/|
| * refs: move current_id before the reflog parametersCarlos Martín Nieto2014-02-103-16/+16
| * refs: conditional wording fixupsCarlos Martín Nieto2014-02-102-11/+13
|/
* Merge pull request #2107 from rocky-luo/examples-diff-numstatBen Straub2014-02-091-8/+38
|\
| * replace 'out' with 'patch',replace the literal tabs with '\t'.rocky-luo2014-02-091-6/+6
| * add example for diff with --numstatrocky-luo2014-02-081-8/+38
|/
* Merge pull request #2056 from libgit2/rb/commit-amendBen Straub2014-02-075-76/+314
|\
| * Add git_commit_amend APIRussell Belfer2014-02-075-76/+314
|/
* Merge pull request #2099 from libgit2/bs/more-reflog-stuffRussell Belfer2014-02-0740-130/+472
|\
| * Correct default reflog message for git_remote_fetchBen Straub2014-02-063-2/+42
| * Fix terrible indentationBen Straub2014-02-062-2/+2
| * Only run clone-failure test on private repoBen Straub2014-02-052-2/+8
| * More merge.conflictstyle fixesBen Straub2014-02-051-0/+7
| * Avoid crash when skipping remote testBen Straub2014-02-051-2/+4
| * Fix broken clone testBen Straub2014-02-051-12/+4
| * Prevent user's merge.conflictstyle from breaking testsBen Straub2014-02-053-0/+21
| * Fix a few references to changed function signaturesBen Straub2014-02-052-4/+4
View Lorry Controller Status