summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Reload config in git_submodule_lookup() if not foundrefresh-submodule-on-lookupJustin Spahr-Summers2014-02-181-2/+9
* 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
| * 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
| * | 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
| * | Fix warningBen Straub2014-02-031-1/+1
| * | Add reflog parameters to git_resetBen Straub2014-02-0311-42/+61
| * | Reset helpers: use revparse insteadBen Straub2014-02-038-32/+23
* | | Merge pull request #2042 from libgit2/cmn/conditional-refRussell Belfer2014-02-079-55/+444
|\ \ \
| * | | refs: add an unconditional deleteCarlos Martín Nieto2014-02-053-0/+36
| * | | refs: catch cases where the ref type has changedCarlos Martín Nieto2014-02-052-3/+73
| * | | refs: check the ref's old value when deletingCarlos Martín Nieto2014-02-053-2/+46
| * | | refs: placeholder conditional deleteCarlos Martín Nieto2014-02-055-27/+49
| * | | refs: factor out old value comparisonCarlos Martín Nieto2014-02-051-14/+26
| * | | refs: bring conditional symbolic updates to the frontendCarlos Martín Nieto2014-02-053-6/+78
| * | | refdb: add conditional symbolic updatesCarlos Martín Nieto2014-02-055-25/+27
| * | | refs: add tests for conditional updatesCarlos Martín Nieto2014-02-051-0/+42
| * | | refs: fix leak on successful updateCarlos Martín Nieto2014-02-051-7/+7
| * | | refs: return GIT_EMODIFIED if the ref target movedCarlos Martín Nieto2014-02-053-4/+9
| * | | refs: changes from feedbackCarlos Martín Nieto2014-02-052-28/+18
View Lorry Controller Status