summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'v2.10.4' into maint-2.11Junio C Hamano2017-07-301-0/+8
|\
| * Merge tag 'v2.9.5' into maint-2.10Junio C Hamano2017-07-301-0/+8
| |\
| | * Merge tag 'v2.8.6' into maint-2.9Junio C Hamano2017-07-301-0/+8
| | |\
| | | * Merge tag 'v2.7.6' into maint-2.8Junio C Hamano2017-07-301-0/+8
| | | |\
| | | | * connect: factor out "looks like command line option" checkJeff King2017-07-281-0/+8
| | | | * Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2016-03-101-0/+10
| | | | |\
| | | | * \ Merge branch 'jc/am-i-v-fix' into maintJunio C Hamano2016-03-101-0/+3
| | | | |\ \
| | | | * \ \ Merge branch 'ps/config-error' into maintJunio C Hamano2016-03-101-5/+9
| | | | |\ \ \
| | | | * \ \ \ Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-02-221-0/+1
| | | | |\ \ \ \
| * | | | \ \ \ \ Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano2016-10-281-0/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-291-5/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/hex2chr' into maintJunio C Hamano2016-09-191-0/+10
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/in-core-index-doc' into maintJunio C Hamano2017-01-311-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cache.h: document add_[file_]to_indexStefan Beller2017-01-191-0/+10
| * | | | | | | | | | | | cache.h: document remove_index_entry_atStefan Beller2017-01-191-0/+3
| * | | | | | | | | | | | cache.h: document index_name_posStefan Beller2017-01-191-0/+19
* | | | | | | | | | | | | compression: unify pack.compression configuration parsingjc/compression-configJunio C Hamano2016-11-151-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ls/git-open-cloexec'Junio C Hamano2016-10-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | sha1_file: rename git_open_noatime() to git_open()Lars Schneider2016-10-251-1/+1
* | | | | | | | | | | | | Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano2016-10-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | find_unique_abbrev: use 4-buffer ringJeff King2016-10-261-2/+2
* | | | | | | | | | | | | | Merge branch 'jk/abbrev-auto'Junio C Hamano2016-10-271-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | find_unique_abbrev: move logic out of get_short_sha1()jk/abbrev-autoJeff King2016-10-031-1/+6
* | | | | | | | | | | | | | | Merge branch 'lt/abbrev-auto'Junio C Hamano2016-10-271-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | / / / / / / / / / / / / / | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | abbrev: auto size the default abbreviationlt/abbrev-autoLinus Torvalds2016-10-031-0/+1
| * | | | | | | | | | | | | abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizingJunio C Hamano2016-10-031-0/+3
* | | | | | | | | | | | | | Merge branch 'jk/fetch-quick-tag-following'Junio C Hamano2016-10-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | fetch: use "quick" has_sha1_file for tag followingjk/fetch-quick-tag-followingJeff King2016-10-141-0/+1
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'jk/reflog-date' into maintJunio C Hamano2016-09-081-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano2016-09-081-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/ls-files-recurse-submodules'Junio C Hamano2016-10-261-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git: make super-prefix optionBrandon Williams2016-10-101-0/+2
* | | | | | | | | | | | | | | | Merge branch 'jk/quarantine-received-objects'Junio C Hamano2016-10-171-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | tmp-objdir: put quarantine information in the environmentJeff King2016-10-101-0/+1
* | | | | | | | | | | | | | | | Merge branch 'jk/alt-odb-cleanup'Junio C Hamano2016-10-171-3/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | alternates: store scratch buffer as strbufJeff King2016-10-101-2/+11
| * | | | | | | | | | | | | | | alternates: use a separate scratch spaceJeff King2016-10-101-1/+4
| * | | | | | | | | | | | | | | alternates: provide helper for allocating alternateJeff King2016-10-101-0/+6
| * | | | | | | | | | | | | | | alternates: provide helper for adding to alternates listJeff King2016-10-101-1/+13
* | | | | | | | | | | | | | | | Merge branch 'jk/pack-objects-optim-mru'Junio C Hamano2016-10-101-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | sha1_file: make packed_object_info publicJeff King2016-08-111-0/+1
| * | | | | | | | | | | | | | | | provide an initializer for "struct object_info"Jeff King2016-08-111-0/+7
* | | | | | | | | | | | | | | | | Merge branch 'jk/ambiguous-short-object-names'Junio C Hamano2016-10-061-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | / / / / / / / / / / | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | get_short_sha1: make default disambiguation configurableJeff King2016-09-271-0/+2
| * | | | | | | | | | | | | | | get_sha1: detect buggy calls with multiple disambiguatorsJeff King2016-09-261-0/+5
* | | | | | | | | | | | | | | | Merge branch 'nd/init-core-worktree-in-multi-worktree-world'Junio C Hamano2016-10-031-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | init: call set_git_dir_init() from within init_db()Nguyễn Thái Ngọc Duy2016-09-251-2/+3
* | | | | | | | | | | | | | | | | Merge branch 'rs/checkout-init-macro'Junio C Hamano2016-09-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | introduce CHECKOUT_INITrs/checkout-init-macroRené Scharfe2016-09-221-0/+1
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'tg/add-chmod+x-fix'Junio C Hamano2016-09-261-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | / / / / / / / | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |