summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* tree: handle removal of all entries in the updatercmn/remove-single-entryCarlos Martín Nieto2016-05-241-0/+9
* tree: plug leaks in the tree updatercmn/tree-update-basenameCarlos Martín Nieto2016-05-191-3/+11
* tree: use the basename for the entry removalCarlos Martín Nieto2016-05-191-1/+1
* Introduce a function to create a tree based on a different onecmn/tree-updateCarlos Martín Nieto2016-05-171-0/+245
* Merge pull request #3767 from pks-t/pks/misc-fixesEdward Thomson2016-05-096-23/+21
|\
| * diff: simplify code for handling empty dirsPatrick Steinhardt2016-05-031-10/+6
| * delta-apply: fix sign extensionPatrick Steinhardt2016-05-021-5/+5
| * odb_loose: fix undefined behavior when computing sizePatrick Steinhardt2016-05-021-1/+1
| * checkout: set ignorecase=0 when config lookup failsPatrick Steinhardt2016-05-021-2/+4
| * merge_file: do not unnecessarily check ours/theirs for NULLPatrick Steinhardt2016-05-021-4/+4
| * index: fix memory leak on error casePatrick Steinhardt2016-05-021-1/+1
* | Merge pull request #3773 from lucasderraugh/patch-1Edward Thomson2016-05-081-0/+1
|\ \
| * | Fix unused variable 'message' warningLucas Derraugh2016-05-051-0/+1
* | | Merge pull request #3757 from johnhaley81/jh/fix-create-initial-commitCarlos Martín Nieto2016-05-061-1/+1
|\ \ \ | |/ / |/| |
| * | Fix `git_commit_create` for an initial commitJohn Haley2016-05-031-1/+1
* | | rebase: handle no common ancestor for inmemoryethomson/rebase_inmemory_no_baseEdward Thomson2016-05-031-4/+15
|/ /
* | Merge pull request #3759 from libgit2/cmn/faster-headerEdward Thomson2016-05-023-6/+48
|\ \ | |/ |/|
| * odb: avoid inflating the full delta to read the headercmn/faster-headerCarlos Martín Nieto2016-05-023-6/+48
* | Merge pull request #3763 from libgit2/ethomson/signature_from_bufferCarlos Martín Nieto2016-04-291-1/+26
|\ \
| * | Introduce `git_signature_from_buffer`ethomson/signature_from_bufferEdward Thomson2016-04-281-1/+26
| |/
* | Merge pull request #3760 from backhub/bug/openssl_readEdward Thomson2016-04-281-1/+1
|\ \ | |/ |/|
| * Fix style: no bracesChristian Schlack2016-04-271-2/+1
| * Fix return value of openssl_read (infinite loop)Christian Schlack2016-04-261-2/+3
* | annotated_commit: provide refs and descriptionethomson/annotated_commit_refsEdward Thomson2016-04-265-85/+108
|/
* Merge pull request #3749 from arthurschreiber/arthur/add-git-reference-dupCarlos Martín Nieto2016-04-261-1/+13
|\
| * Allow creating copies of `git_reference` objects.Arthur Schreiber2016-04-221-1/+13
* | Merge pull request #3748 from libgit2/ethomson/rebase_detachedCarlos Martín Nieto2016-04-261-27/+46
|\ \
| * | rebase: correctly finish rebasing detached headsethomson/rebase_detachedEdward Thomson2016-04-211-24/+35
| * | rebase: handle detached HEADs in `init`Edward Thomson2016-04-211-3/+11
| |/
* | tag: ignore extra header fieldscmn/silly-tagsCarlos Martín Nieto2016-04-251-2/+8
* | transport: cast away constness for freeEdward Thomson2016-04-211-1/+1
* | stransport: pass proxy opts instead of char*Edward Thomson2016-04-211-2/+4
* | iterator: ignore submodule in has_endedEdward Thomson2016-04-211-4/+3
|/
* Merge pull request #3110 from libgit2/cmn/proxy-configEdward Thomson2016-04-1913-48/+345
|\
| * proxy: don't specify the protocol in the typeCarlos Martín Nieto2016-04-192-2/+2
| * winhttp: correctly detect HTTPS usageCarlos Martín Nieto2016-04-191-2/+14
| * curl: ask for proxy credentialsCarlos Martín Nieto2016-04-191-4/+81
| * net: use proxy options struct in the stream configCarlos Martín Nieto2016-04-194-15/+44
| * proxy: don't require the trailing slash on WinHTTPCarlos Martín Nieto2016-04-191-1/+2
| * netops: make the path optional in URLsCarlos Martín Nieto2016-04-191-10/+12
| * proxy: use poxy to test our Windows proxy supportCarlos Martín Nieto2016-04-191-0/+1
| * proxy: ask the user for credentials if necessaryCarlos Martín Nieto2016-04-198-19/+178
| * proxy: introduce a proxy options structCarlos Martín Nieto2016-04-191-0/+16
* | ignore: move star-star matching closer to it usecmn/ignore-starstarCarlos Martín Nieto2016-04-191-16/+11
* | ignore: fix directory limits when searching for star-starCarlos Martín Nieto2016-04-191-6/+24
|/
* refs: provide a more general error message for dwimcmn/dwim-general-messageCarlos Martín Nieto2016-04-111-0/+3
* Merge pull request #3724 from ethomson/submodule_start_supports_silly_slashesCarlos Martín Nieto2016-04-021-10/+26
|\
| * iterator: support trailing `/` in start for submodEdward Thomson2016-04-021-10/+26
* | ignore: don't use realpath to canonicalize pathcmn/ignore-symlinkCarlos Martín Nieto2016-04-021-3/+11
|/
* Merge pull request #3720 from pks-t/pks/merge-driver-memleaksCarlos Martín Nieto2016-04-011-0/+1
|\