summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | reset: remove reflog message overrideCarlos Martín Nieto2015-03-032-9/+6
* | | Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-0316-148/+183
* | | Merge pull request #2908 from ethomson/safe_createCarlos Martín Nieto2015-03-034-8/+14
|\ \ \
| * | | checkout: remove `GIT_CHECKOUT_SAFE_CREATE` as a strategyEdward Thomson2015-02-272-9/+8
| * | | checkout: upgrade to `SAFE_CREATE` when no index fileEdward Thomson2015-02-271-0/+7
| * | | cherrypick, revert: drop unnecessary SAFE_CREATEEdward Thomson2015-02-272-2/+2
* | | | branch: do capture the error codeCarlos Martín Nieto2015-03-031-1/+1
* | | | Merge pull request #2937 from git-up/branch_delete_reflogCarlos Martín Nieto2015-03-031-1/+6
|\ \ \ \
| * | | | git_branch_delete() should ignore errors from non-existing reflogsPierre-Olivier Latour2015-03-021-1/+6
| | |_|/ | |/| |
* | | | win32: add the patch level to the .dll fileversionEdward Thomson2015-03-021-2/+2
|/ / /
* | | rebase: check alloc resultEdward Thomson2015-02-271-0/+1
|/ /
* | Fix MAX 32 bit build problem described in libgit2/libgit2#2917ntk/macosx_build_cherrypickedJeff Hostetler2015-02-201-1/+1
* | Merge pull request #2907 from jasonhaslam/git_packfile_unpack_raceCarlos Martín Nieto2015-02-201-2/+9
|\ \
| * | Fix race in git_packfile_unpack.Jason Haslam2015-02-141-2/+9
| |/
* | filter: take `temp_buf` in `git_filter_options`Edward Thomson2015-02-193-13/+9
* | filter: add `git_filter_list__load_ext`Edward Thomson2015-02-193-16/+32
* | git_filter_opt_t -> git_filter_flag_tEdward Thomson2015-02-198-19/+19
* | buffer: introduce git_buf_attach_notownedEdward Thomson2015-02-196-37/+35
* | checkout: let the stream writer close the fdEdward Thomson2015-02-181-2/+1
* | filter streams: base -> parentEdward Thomson2015-02-181-8/+8
* | git_writestream: from git_filter_streamEdward Thomson2015-02-182-30/+30
* | checkout: maintain temporary buffer for filtersEdward Thomson2015-02-173-12/+27
* | checkout: stream the blob into the filtersEdward Thomson2015-02-172-39/+84
* | filters: stream internallyEdward Thomson2015-02-171-73/+81
* | filters: introduce streaming filtersEdward Thomson2015-02-171-7/+231
* | Remove extra semicolon outside of a functionStefan Widgren2015-02-1520-22/+22
* | Merge pull request #2831 from ethomson/merge_lockCarlos Martín Nieto2015-02-157-59/+172
|\ \
| * | indexwriter: an indexwriter for repo operationsEdward Thomson2015-02-146-92/+79
| * | merge-like operations: lock index while workingEdward Thomson2015-02-143-11/+67
| * | merge: lock the index at the start of the mergeEdward Thomson2015-02-141-2/+19
| * | checkout: introduce GIT_CHECKOUT_DONT_WRITE_INDEXEdward Thomson2015-02-141-1/+4
| * | git_indexwriter: lock then write the indexEdward Thomson2015-02-142-29/+79
| |/
* | Merge pull request #2895 from ethomson/alloc_overflowCarlos Martín Nieto2015-02-1554-296/+791
|\ \
| * | pack-objects: unlock the cache on integer overflowEdward Thomson2015-02-131-4/+5
| * | integer overflow: use compiler intrinsics if supportedEdward Thomson2015-02-132-0/+20
| * | filebuf: use an int for return checkEdward Thomson2015-02-131-2/+2
| * | Make our overflow check look more like gcc/clang'sEdward Thomson2015-02-1335-341/+342
| * | Update `khash.h` to pull request 42Edward Thomson2015-02-124-5/+11
| * | khash: update to klib f28c067Edward Thomson2015-02-121-24/+33