summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* work around buggy S_ISxxx(m) implementationsRené Scharfe2010-10-061-3/+10
* Merge branch 'kf/askpass-config'Junio C Hamano2010-09-081-0/+1
|\
| * Add a new option 'core.askpass'.Anselm Kruis2010-08-311-0/+1
* | Merge branch 'jk/maint-pass-c-config-in-env'Junio C Hamano2010-09-081-1/+4
|\ \
| * | do not pass "git -c foo=bar" params to transport helpersJonathan Nieder2010-08-241-1/+1
| * | pass "git -c foo=bar" params through environmentJeff King2010-08-241-0/+3
| |/
* | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-031-0/+1
|\ \
| * | merge-recursive --renormalizeJonathan Nieder2010-08-061-1/+0
| * | Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-021-0/+2
| |/
* | Merge branch 'jn/paginate-fix'Junio C Hamano2010-08-311-0/+6
|\ \
| * | setup: remember whether repository was foundNguyễn Thái Ngọc Duy2010-08-111-0/+1
| * | git wrapper: introduce startup_info structNguyễn Thái Ngọc Duy2010-08-111-0/+5
| |/
* | Merge branch 'gb/split-cmdline-errmsg'Junio C Hamano2010-08-211-0/+2
|\ \
| * | split_cmdline: Allow caller to access error stringGreg Brockman2010-08-111-0/+2
| |/
* | Merge branch 'nd/fix-sparse-checkout'Junio C Hamano2010-08-211-2/+1
|\ \
| * | unpack-trees: let read-tree -u remove index entries outside sparse areaNguyễn Thái Ngọc Duy2010-08-091-2/+1
* | | Merge branch 'hv/submodule-find-ff-merge'Junio C Hamano2010-08-211-0/+3
|\ \ \
| * | | Teach ref iteration module about submodulesHeiko Voigt2010-07-071-0/+3
| | |/ | |/|
* | | Merge branch 'jn/parse-date-basic'Junio C Hamano2010-08-121-0/+1
|\ \ \
| * | | Export parse_date_basic() to convert a date string to timestampJonathan Nieder2010-07-151-0/+1
| |/ /
* | | Standardize do { ... } while (0) styleJonathan Nieder2010-08-121-1/+1
|/ /
* | Merge branch 'cp/textconv-cat-file'Junio C Hamano2010-06-271-0/+11
|\ \
| * | sha1_name: add get_sha1_with_context()Clément Poulain2010-06-181-0/+11
* | | Merge branch 'eb/core-eol'Junio C Hamano2010-06-211-1/+21
|\ \ \
| * | | Add "core.eol" config variableEyvind Bernhardsen2010-06-061-0/+13
| * | | Add per-repository eol normalizationEyvind Bernhardsen2010-05-191-1/+8
| | |/ | |/|
* | | Merge branch 'gv/portable'Junio C Hamano2010-06-211-8/+8
|\ \ \ | |_|/ |/| |
| * | enums: omit trailing comma for portabilityGary V. Vaughan2010-05-311-8/+8
* | | Merge branch 'sp/maint-dumb-http-pack-reidx'Junio C Hamano2010-05-211-1/+2
|\ \ \
| * | | Allow parse_pack_index on temporary filesShawn O. Pearce2010-04-191-1/+1
| * | | Introduce close_pack_index to permit replacementShawn O. Pearce2010-04-191-0/+1
| * | | Merge branch 'gb/maint-submodule-env' into maintJunio C Hamano2010-03-081-0/+9
| |\ \ \
| * \ \ \ Merge branch 'mm/mkstemps-mode-for-packfiles' into maintJunio C Hamano2010-03-081-0/+4
| |\ \ \ \
* | \ \ \ \ Merge branch 'ld/discovery-limit-to-fs' (early part)Junio C Hamano2010-05-211-0/+1
|\ \ \ \ \ \
| * | | | | | config.c: remove static keyword from git_env_bool()Lars R. Damerow2010-03-281-0/+1
* | | | | | | Merge branch 'ar/config-from-command-line'Junio C Hamano2010-05-211-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Complete prototype of git_config_from_parameters()Thomas Rast2010-05-211-1/+1
| * | | | | | | Allow passing of configuration parameters in the command lineAlex Riesen2010-03-281-0/+2
* | | | | | | | Merge branch 'sd/log-decorate'Junio C Hamano2010-05-081-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | git_config_maybe_bool()Junio C Hamano2010-02-171-0/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'cw/ws-indent-with-tab'Junio C Hamano2010-05-081-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dstChris Webb2010-04-041-1/+1
| * | | | | | | | whitespace: add tab-in-indent error classChris Webb2010-04-021-0/+1
* | | | | | | | | make commit_tree a library functionJeff King2010-04-011-0/+2
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | fix const-correctness of write_sha1_fileJeff King2010-04-011-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-281-0/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | builtin/merge: make checkout_fast_forward() non staticJunio C Hamano2010-03-061-0/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'tr/notes-display'Junio C Hamano2010-03-241-0/+3
|\ \ \ \ \ \
| * | | | | | notes: implement helpers needed for note copying during rewriteThomas Rast2010-03-121-0/+2
| * | | | | | Support showing notes from more than one notes treeThomas Rast2010-03-121-0/+1