summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | | convert: rename the "eol" global variable to "core_eol"Junio C Hamano2011-05-091-1/+1
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'im/hashcmp-optim'Junio C Hamano2011-05-061-4/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | hashcmp(): inline memcmp() by hand to optimizeIngo Molnar2011-04-281-4/+14
* | | | | | | | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | pathspec: rename per-item field has_wildcard to use_wildcardJunio C Hamano2011-04-051-1/+1
* | | | | | | | | | | Merge branch 'jc/pack-objects-bigfile'Junio C Hamano2011-04-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Teach core.bigfilethreashold to pack-objectsJunio C Hamano2011-04-051-0/+1
* | | | | | | | | | | | Merge branch 'nd/init-gitdir'Junio C Hamano2011-04-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | init, clone: support --separate-git-dir for .git fileNguyễn Thái Ngọc Duy2011-03-191-0/+1
* | | | | | | | | | | | | Merge branch 'jc/index-update-if-able'Junio C Hamano2011-03-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | diff/status: refactor opportunistic index updateJunio C Hamano2011-03-211-0/+1
* | | | | | | | | | | | | Merge branch 'jc/maint-rerere-in-workdir'Junio C Hamano2011-03-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rerere: make sure it works even in a workdir attached to a young repositoryJunio C Hamano2011-03-231-0/+1
* | | | | | | | | | | | | | Merge branch 'lt/default-abbrev'Junio C Hamano2011-03-231-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Make the default abbrev length configurableLinus Torvalds2011-03-111-2/+3
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jn/test-sanitize-git-env'Junio C Hamano2011-03-221-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | config: drop support for GIT_CONFIG_NOGLOBALJonathan Nieder2011-03-151-1/+0
* | | | | | | | | | | | | Merge branch 'ab/i18n-basic'Junio C Hamano2011-03-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \