summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-291-5/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add: modify already added files when --chmod is givenThomas Gummerer2016-09-151-5/+5
| * | | | | | | | | | read-cache: introduce chmod_index_entryThomas Gummerer2016-09-151-0/+2
* | | | | | | | | | | Merge branch 'rs/hex2chr' into maintJunio C Hamano2016-09-191-0/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | introduce hex2chr() for converting two hexadecimal digits to a characterrs/hex2chrRené Scharfe2016-09-071-0/+10
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'jk/reset-ident-time-per-commit' into maintJunio C Hamano2016-08-121-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/send-pack-stdio' into maintJunio C Hamano2016-08-081-1/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/trace-fixup'Junio C Hamano2016-08-121-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | write_or_die: drop write_or_whine_pipe()Jeff King2016-08-051-1/+0
* | | | | | | | | | | | | | Merge branch 'jk/reset-ident-time-per-commit'Junio C Hamano2016-08-101-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am: reset cached ident date for each patchjk/reset-ident-time-per-commitJeff King2016-08-011-0/+1
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/pack-objects-optim'Junio C Hamano2016-08-081-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | find_pack_entry: replace last_found_pack with MRU cacheJeff King2016-07-291-0/+7
| * | | | | | | | | | | | | sha1_file: drop free_pack_by_nameJeff King2016-07-291-1/+0
* | | | | | | | | | | | | | Merge branch 'va/i18n'Junio C Hamano2016-08-081-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | i18n: config: unfold error messages marked for translationVasco Almeida2016-07-281-2/+10
* | | | | | | | | | | | | | | Merge branch 'jk/reflog-date'Junio C Hamano2016-08-081-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | / / / / / / | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | date: add "unix" formatJeff King2016-07-271-1/+2
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'nd/pack-ofs-4gb-limit'Junio C Hamano2016-07-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | / / / / / / / / | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | sha1_file.c: use type off_t* for object_info->disk_sizepNguyễn Thái Ngọc Duy2016-07-131-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-07-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | merge: avoid "safer crlf" during recording of merge resultsJunio C Hamano2016-07-121-0/+1
* | | | | | | | | | | Merge branch 'mh/split-under-lock'Junio C Hamano2016-07-251-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | safe_create_leading_directories(): improve docstringMichael Haggerty2016-05-051-0/+5
* | | | | | | | | | | Merge branch 'jk/write-file'Junio C Hamano2016-07-191-2/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | write_file: add format attributeJeff King2016-07-081-0/+8
| * | | | | | | | | | | write_file: add pointer+len variantJeff King2016-07-081-0/+6
| * | | | | | | | | | | write_file: drop "gently" formJeff King2016-07-081-2/+1
* | | | | | | | | | | | Merge branch 'bc/cocci'Junio C Hamano2016-07-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | hex: add oid_to_hex_r()brian m. carlson2016-06-281-0/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jk/upload-pack-hook'Junio C Hamano2016-07-061-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | config: add a notion of "scope"Jeff King2016-05-271-0/+11
| * | | | | | | | | | | | config: return configset value for current_config_ functionsJeff King2016-05-271-0/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jk/send-pack-stdio'Junio C Hamano2016-07-061-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | / / / / / / | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | write_or_die: remove the unused write_or_whine() functionjk/send-pack-stdioRamsay Jones2016-06-101-1/+0
| | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'js/windows-dotgit' into maintJunio C Hamano2016-05-261-0/+8
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'nd/remove-unused' into HEADJunio C Hamano2016-05-181-2/+0
| |\ \ \ \ \ \ \ \ \ \