summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/ref-namespaces'Junio C Hamano2011-08-171-0/+3
|\
| * ref namespaces: infrastructureJosh Triplett2011-07-061-0/+3
* | Merge branch 'cb/partial-commit-relative-pathspec'Junio C Hamano2011-08-111-0/+1
|\ \
| * | commit: allow partial commits with relative pathsClemens Buchacher2011-08-021-0/+1
* | | Merge branch 'jc/pack-order-tweak'Junio C Hamano2011-08-051-0/+3
|\ \ \
| * | | core: log offset pack data accesses happenedJunio C Hamano2011-07-061-0/+3
* | | | Merge branch 'jc/index-pack'Junio C Hamano2011-07-191-1/+0
|\ \ \ \
| * | | | verify-pack: use index-pack --verifyJunio C Hamano2011-06-051-1/+0
* | | | | Merge branch 'jk/clone-cmdline-config'Junio C Hamano2011-07-191-0/+2
|\ \ \ \ \
| * | | | | config: make git_config_parse_parameter a public functionJeff King2011-06-221-0/+2
* | | | | | Merge branch 'jc/zlib-wrap'Junio C Hamano2011-07-191-9/+23
|\ \ \ \ \ \
| * | | | | | zlib: zlib can only process 4GB at a timeJunio C Hamano2011-06-101-13/+22
| * | | | | | zlib: wrap deflateBound() tooJunio C Hamano2011-06-101-3/+1
| * | | | | | zlib: wrap deflate side of the APIJunio C Hamano2011-06-101-0/+6
| * | | | | | zlib: wrap inflateInit2 used to accept only for gzip formatJunio C Hamano2011-06-101-0/+1
| |/ / / / /
| * | | | | Merge branch 'jk/maint-config-alias-fix' into maintJunio C Hamano2011-06-011-2/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/git-connection-deadlock-fix' into maintJunio C Hamano2011-05-261-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/pack-objects-bigfile' into maintJunio C Hamano2011-05-041-0/+1
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jc/streaming-filter' into nextJunio C Hamano2011-06-291-37/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | convert.h: move declarations for conversion from cache.hJunio C Hamano2011-05-261-37/+1
* | | | | | | | | | Merge branch 'jc/streaming' into nextJunio C Hamano2011-06-291-1/+35
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | sha1_file.c: expose helpers to read loose objectsJunio C Hamano2011-05-201-0/+3
| * | | | | | | | streaming_write_entry(): use streaming API in write_entry()Junio C Hamano2011-05-201-0/+1
| * | | | | | | | unpack_object_header(): make it publicJunio C Hamano2011-05-201-0/+1
| * | | | | | | | sha1_object_info_extended(): hint about objects in delta-base cacheJunio C Hamano2011-05-201-1/+2
| * | | | | | | | sha1_object_info_extended(): expose a bit more infoJunio C Hamano2011-05-191-0/+28
| * | | | | | | | packed_object_info_detail(): do not return a stringJunio C Hamano2011-05-161-1/+1
| | | | | | | | |
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| *---. \ \ \ \ \ \ \ Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streamingJunio C Hamano2011-05-151-7/+20
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'ef/maint-win-verify-path'Junio C Hamano2011-06-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | A Windows path starting with a backslash is absoluteTheo Niessink2011-05-271-1/+1
| * | | | | | | | | | | Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4Junio C Hamano2011-05-261-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'jc/index-update-if-able' into maintJunio C Hamano2011-04-031-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lt/default-abbrev' into maintJunio C Hamano2011-04-031-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lp/config-vername-check' into maintJunio C Hamano2011-04-031-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/maint-fd-limit' into maintJunio C Hamano2011-03-201-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-config-alias-fix'Junio C Hamano2011-05-301-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | config: make environment parsing routines staticJeff King2011-05-241-2/+0
* | | | | | | | | | | | | | | | Merge branch 'jc/bigfile'Junio C Hamano2011-05-251-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | index_fd(): turn write_object and format_check arguments into one flagJunio C Hamano2011-05-091-2/+5
* | | | | | | | | | | | | | | Merge branch 'mg/config-symbolic-constants'Junio C Hamano2011-05-231-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | config: define and document exit codesMichael J Gruber2011-05-171-0/+10
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jc/magic-pathspec'Junio C Hamano2011-05-231-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fix overslow :/no-such-string-ever-existed diagnosticsJunio C Hamano2011-05-101-4/+4
* | | | | | | | | | | | | | | | Merge branch 'jc/replacing'Junio C Hamano2011-05-191-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | read_sha1_file(): allow selective bypassing of replacement mechanismJunio C Hamano2011-05-151-1/+6
| * | | | | | | | | | | | | | | inline lookup_replace_object() callsJunio C Hamano2011-05-151-2/+10
| * | | | | | | | | | | | | | | read_sha1_file(): get rid of read_sha1_file_repl() madnessJunio C Hamano2011-05-151-5/+1
| * | | | | | | | | | | | | | | Declare lookup_replace_object() in cache.h, not in commit.hJunio C Hamano2011-05-151-0/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/git-connection-deadlock-fix'Junio C Hamano2011-05-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | connect: let callers know if connection is a socketJeff King2011-05-161-0/+1