summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Patch from @carlosmn to refresh the parent config before snapshotting.refresh-config-snapshotAlan Rogers2014-10-231-1/+6
* Change the length of the file so that the change is picked up.Alan Rogers2014-10-231-2/+2
* Add a test to make sure a new snapshot has the new value.Alan Rogers2014-10-231-1/+14
* Merge pull request #2609 from linquize/describe-optsEdward Thomson2014-10-131-15/+31
|\
| * describe: Initialize options for git_describe_format() if nullLinquize2014-10-111-14/+30
| * describe: Do not crash if pass null option to git_describe_commit()Linquize2014-10-111-1/+1
* | Merge pull request #2615 from ethomson/mount_pointsEdward Thomson2014-10-132-17/+38
|\ \
| * | is_empty_dir (wi32): cope with empty mount pointsEdward Thomson2014-10-131-16/+26
| * | p_lstat win32: don't canonicalize volume mountsEdward Thomson2014-10-131-1/+12
* | | Merge pull request #2616 from ethomson/index_crlfEdward Thomson2014-10-135-3/+90
|\ \ \
| * | | Don't copy buffer in checkout unless neededEdward Thomson2014-10-131-6/+8
| * | | Ensure filters (i.e. CRLF) are applied when checking out conflict contentJacques Germishuys2014-10-131-3/+19
| * | | Introduce failing test for conflict filtering in indexEdward Thomson2014-10-134-0/+69
|/ / /
* | | Merge pull request #2618 from csware/msvc-no-z-prefixEdward Thomson2014-10-132-1/+3
|\ \ \
| * | | There is no "z" size specifier on MSVCSven Strickroth2014-10-132-1/+3
|/ / /
* | | Merge pull request #2613 from libgit2/rb/minor-cleanupsEdward Thomson2014-10-114-5/+5
|\ \ \ | |_|/ |/| |
| * | Don't use cl_git_pass for POSIX functionsrb/minor-cleanupsRussell Belfer2014-10-102-3/+3
| * | Move un-namespaced constant to internal headerRussell Belfer2014-10-102-2/+2
|/ /
* | Merge pull request #2470 from libgit2/cmn/read-tree-cacheEdward Thomson2014-10-108-47/+457
|\ \
| * | Update CHANGELOG and PROJECTS with the tree cache changesCarlos Martín Nieto2014-10-102-2/+3
| * | index: fill the tree cache on write-treeCarlos Martín Nieto2014-10-101-1/+16
| * | index: make sure to write cached subtrees if parent is invalidatedCarlos Martín Nieto2014-10-102-4/+55
| * | index: write out the tree cache extensionCarlos Martín Nieto2014-10-105-19/+168
| * | tree-cache: remove the parent pointerCarlos Martín Nieto2014-10-102-11/+9
| * | index: add tests for the tree cacheCarlos Martín Nieto2014-10-101-0/+110
| * | index: fill the tree cache when reading from a treeCarlos Martín Nieto2014-10-103-0/+83
| * | tree-cache: move to use a pool allocatorCarlos Martín Nieto2014-10-104-30/+22
| * | tree-cache: extract the allocationCarlos Martín Nieto2014-10-102-12/+23
|/ /
* | Merge pull request #2593 from libgit2/cmn/remote-delete-nameEdward Thomson2014-10-104-39/+14
|\ \
| * | remote: accept a repository and remote name for deletioncmn/remote-delete-nameCarlos Martín Nieto2014-09-304-39/+14
* | | Merge pull request #2575 from cirosantilli/factor-struct-typedefCarlos Martín Nieto2014-10-106-32/+18
|\ \ \ | |_|/ |/| |
| * | Join typedef and struct definitions in single file.Ciro Santilli2014-09-246-32/+18
* | | Fix test buildCarlos Martín Nieto2014-10-102-3/+3
* | | Merge pull request #2498 from linquize/read-large-fileCarlos Martín Nieto2014-10-102-5/+4
|\ \ \
| * | | Can read large file larger than 2GB on WindowsLinquize2014-08-102-5/+4
* | | | Merge pull request #2556 from sbc100/fix_warningsCarlos Martín Nieto2014-10-101-2/+2
|\ \ \ \
| * | | | Fix warnings in thread-utils.h when building without -DTHREADSAFE=ONSam Clegg2014-09-082-4/+2
* | | | | Merge pull request #2542 from linquize/fetch-headCarlos Martín Nieto2014-10-102-3/+46
|\ \ \ \ \
| * | | | | Add network::fetchlocal multi remotes testLinquize2014-09-021-0/+34
| * | | | | When updating FETCH_HEAD, do not treat it as error if the remote of current b...Linquize2014-09-021-3/+12
* | | | | | Merge pull request #2600 from libgit2/cmn/embed-sshCarlos Martín Nieto2014-10-102-2/+17
|\ \ \ \ \ \
| * | | | | | Provide option to embed libssh2cmn/embed-sshCarlos Martín Nieto2014-10-052-2/+17
* | | | | | | Merge pull request #2588 from swansontec/ssl-cert-path2Carlos Martín Nieto2014-10-102-1/+35
|\ \ \ \ \ \ \
| * | | | | | | Add support for setting the SSL CA locationWilliam Swanson2014-09-302-1/+35
* | | | | | | | Merge pull request #2499 from csware/hard-reset-checkout-callbacksCarlos Martín Nieto2014-10-1013-61/+70
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow to propagate checkout callbacks to git HARD resetSven Strickroth2014-08-0313-61/+70
* | | | | | | | | Merge pull request #2574 from csware/hostname-for-certificate_check_cbEdward Thomson2014-10-105-7/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add tests for host namesSven Strickroth2014-10-091-2/+4
| * | | | | | | | | Provide host name to certificate_check_cbSven Strickroth2014-09-225-7/+11
* | | | | | | | | | Merge pull request #2473 from arthurschreiber/arthur/new-javascript-test-filesEdward Thomson2014-10-1015-354/+328
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status