summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge pull request #2134 from libgit2/ben/iccVicent Marti2014-02-244-6/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix Intel compiler warnings
| | * | | | | | | 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 merging
| | * | | | | | | 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 ...
| | * | | | | | | Check if librt exists independent of OS, to be able to exclude librt on ↵Tobias Marquardt2014-02-211-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android builds, even though it is a 'Linux'.
| * | | | | | | | Merge pull request #2129 from arrbee/rb/c89-or-c99Vicent Marti2014-02-2114-53/+71
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Improve C89 compatibility and clarify use of C99 features
| | * | | | | | | Address PR commentsRussell Belfer2014-02-2010-29/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make GIT_INLINE an internal definition so it cannot be used in public headers * Fix language in CONTRIBUTING * Make index caps API use signed instead of unsigned values
| | * | | | | | | Clarify C compatibility policyRussell Belfer2014-02-203-21/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and a couple of other minor doc fixups.
| | * | | | | | | 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
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Improve error propagation in shallow call
| | * | | | | | 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.
| | * | | | | | Check for EWOULDBLOCK as well as EAGAIN on write.brian m. carlson2014-02-162-1/+10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some systems, notably HP PA-RISC systems running Linux or HP-UX, EWOULDBLOCK and EAGAIN are not the same value. POSIX (and these OSes) allow EWOULDBLOCK to occur on write(2) (and send(2), etc.), so check explicitly for this case as well as EAGAIN by defining and using a macro GIT_ISBLOCKED that considers both. The macro is necessary because MSYS does not provide EWOULDBLOCK and compilation fails if an attempt is made to use it unconditionally. On most systems, where the two values are the same, the compiler will simply optimize this check out and it will have no effect.
| * | | | | | Merge pull request #2115 from ethomson/crlf_reduxEdward Thomson2014-02-111-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix filter test for CRLF->LF issues
| | * | | | | | 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->LF
| | * | | | | | Never convert CRLF->LFEdward Thomson2014-02-111-17/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Core git performs no conversion on systems that use LF, emulate that.
| * | | | | | Merge pull request #2110 from libgit2/ed/crlf_inputRussell Belfer2014-02-115-26/+248
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Handle `core.autocrlf=input` when checking out
| | * | | | | | 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
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Not closing the files on a diff failure ensures that clar cleanup will fail on win32 because we still have the file open.
| * | | | | | Merge pull request #2111 from libgit2/cmn/cond-fixupsRussell Belfer2014-02-104-23/+25
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Conditional ref update fixups
| | * | | | | refs: move current_id before the reflog parametersCarlos Martín Nieto2014-02-103-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the reflog parameters as the last two, as they're the optional parameters.
| | * | | | | refs: conditional wording fixupsCarlos Martín Nieto2014-02-102-11/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This addresses arrbee's concerns about wording in the conditional reference udpate functions.
| * | | | | Merge pull request #2107 from rocky-luo/examples-diff-numstatBen Straub2014-02-091-8/+38
| |\ \ \ \ \ | | | | | | | | | | | | | | add example for diff with --numstat
| | * | | | | 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 API
| | * | | | | Add git_commit_amend APIRussell Belfer2014-02-075-76/+314
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an API to amend an existing commit, basically a shorthand for creating a new commit filling in missing parameters from the values of an existing commit. As part of this, I also added a new "sys" API to create a commit using a callback to get the parents. This allowed me to rewrite all the other commit creation APIs so that temporary allocations are no longer needed.
| * | | | | Merge pull request #2099 from libgit2/bs/more-reflog-stuffRussell Belfer2014-02-0740-130/+472
| |\ \ \ \ \ | | | | | | | | | | | | | | More reflogness
| | * | | | | 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
| | | | | | |
| | * | | | | Merge remote-tracking branch 'libgit2/development' into bs/more-reflog-stuffBen Straub2014-02-0511-96/+548
| | |\ \ \ \ \
| | * | | | | | Add reflog params to git_repository_detach_headBen Straub2014-02-048-16/+44
| | | | | | | |
| | * | | | | | Add reflog parameters to remote apisBen Straub2014-02-048-22/+101
| | | | | | | | | | | | | | | | | | | | | | | | Also added a test for git_remote_fetch.
| | * | | | | | Add reflog parameters to git_push_update_tipsBen Straub2014-02-043-4/+29
| | | | | | | |
| | * | | | | | Fix reflog message when creating commitsBen Straub2014-02-042-3/+35
| | | | | | | |
| | * | | | | | Add reset tests for reflogBen Straub2014-02-036-1/+101
| | | | | | | |
View Lorry Controller Status