summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* http: do not try to use the cert callback on unencrypted streamscmn/stream-check-ecCarlos Martín Nieto2015-03-162-1/+7
* Merge pull request #2975 from git-up/diff_index_retainCarlos Martín Nieto2015-03-151-2/+1
|\
| * Avoid retaining / releasing the index more than necessary when GIT_DIFF_UPDAT...Pierre-Olivier Latour2015-03-111-2/+1
* | indexer: bring back the error message on duplcate commitsCarlos Martín Nieto2015-03-131-0/+7
* | indexer: don't worry about duplicate objectsCarlos Martín Nieto2015-03-131-2/+2
* | indexer: set an error message on duplicate objects in packCarlos Martín Nieto2015-03-131-0/+1
* | Merge pull request #2973 from libgit2/cmn/local-pack-threadingEdward Thomson2015-03-121-0/+3
|\ \ | |/ |/|
| * local: create pack with multiple threadscmn/local-pack-threadingCarlos Martín Nieto2015-03-111-0/+3
* | Merge commit 'refs/pull/2879/head' of ssh://github.com/libgit2/libgit2Carlos Martín Nieto2015-03-111-8/+52
|\ \ | |/ |/|
| * Add API to add a memory buffer to an indexDamien PROFETA2015-02-251-8/+52
* | Merge pull request #2969 from adrienthebo/remote_add_invalid_refspecCarlos Martín Nieto2015-03-111-0/+3
|\ \
| * | refspec: set err message on invalid refspecAdrien Thebo2015-03-101-0/+3
* | | Merge pull request #2970 from ethomson/inmemory_bareCarlos Martín Nieto2015-03-111-1/+7
|\ \ \ | |/ / |/| |
| * | repository: in-memory repos are bare by defaultEdward Thomson2015-03-101-1/+7
* | | Merge pull request #2964 from git-up/fixesEdward Thomson2015-03-091-1/+1
|\ \ \
| * | | Removed unnecessary GIT_CHECKOUT_SKIP_UNMERGED for GIT_RESET_HARDPierre-Olivier Latour2015-03-081-1/+1
* | | | Merge pull request #2946 from tkelman/appveyor-mingwEdward Thomson2015-03-094-3/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Use secure API if available.Matti Virolainen2015-03-061-1/+1
| * | | Add some missing definitions for mingw.orgTony Kelman2015-03-061-0/+7
| * | | Move definitions of strcasecmp and strncasecmp to msvc-compat.hTony Kelman2015-03-062-2/+3
| |/ /
* | | refdb: use the same id for old and new when renaming a referencecmn/rename-reflogCarlos Martín Nieto2015-03-081-1/+1
* | | Merge pull request #2961 from ethomson/filter_relative_pathsEdward Thomson2015-03-061-2/+1
|\ \ \
| * | | filter: accept relative paths in apply_to_fileEdward Thomson2015-03-061-1/+1
| * | | filter: drop old TODOEdward Thomson2015-03-061-1/+0
| |/ /
* | | Drop trailing whitespacesntk/reflog_branch_createnulltoken2015-03-041-1/+1
* | | branch: fix generated reflog message upon renamingnulltoken2015-03-041-1/+1
* | | branch: fix generated reflog message upon creationnulltoken2015-03-041-1/+1
|/ /
* | Merge pull request #2932 from jeffhostetler/jeffhostetler/big_clone_crashCarlos Martín Nieto2015-03-042-5/+21
|\ \
| * | Change ifdef for MINGW32.Jeff Hostetler2015-03-031-4/+2
| * | Fix p_ftruncate to handle big files for git_cloneJeff Hostetler2015-03-032-4/+22
| |/
* | libgit2_shutdown: free TLS data (win32)Edward Thomson2015-03-041-0/+11
* | libgit2_shutdown: clear err message on shutdownEdward Thomson2015-03-041-9/+27
* | Fix leak of TLS error message in shutdown (ptherad version)Leo Yang2015-03-041-3/+3
* | Merge pull request #2945 from ethomson/empty_hashsig_heapCarlos Martín Nieto2015-03-041-1/+16
|\ \
| * | diff_tform: account for whitespace optionsEdward Thomson2015-03-041-4/+16
| * | diff_tform: don't compare empty hashsig_heapsEdward Thomson2015-03-031-0/+3
* | | Plug a few leaksCarlos Martín Nieto2015-03-044-7/+14
* | | Merge pull request #2941 from libgit2/cmn/http-enforce-credEdward Thomson2015-03-031-0/+5
|\ \ \
| * | | http: enforce the credential typescmn/http-enforce-credCarlos Martín Nieto2015-03-031-0/+5
| |/ /
* | | config: borrow refcounted referencescmn/config-borrow-entryCarlos Martín Nieto2015-03-0312-68/+165
|/ /
* | Remove swp filesCarlos Martín Nieto2015-03-031-0/+0
* | Merge pull request #2934 from akikoskinen/mingw_build_fixEdward Thomson2015-03-032-7/+11
|\ \
| * | Include ws2tcpip.h in order to get in6_addrAki Koskinen2015-03-021-0/+1
| * | Include openssl headers lastAki Koskinen2015-03-021-4/+4
| * | Don't include headers on windows that aren't availableAki Koskinen2015-03-021-3/+6
* | | Merge pull request #2913 from ethomson/stash_fixupEdward Thomson2015-03-031-2/+1
|\ \ \
| * | | stash: correctly stash wd modified/index deletedEdward Thomson2015-02-181-2/+1
* | | | repository: remove log message override for switching the active branchCarlos Martín Nieto2015-03-035-35/+72
* | | | push: remove reflog message overrideCarlos Martín Nieto2015-03-033-13/+6
* | | | branch: don't accept a reflog message overrideCarlos Martín Nieto2015-03-032-19/+16