summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4Junio C Hamano2011-05-261-0/+1
|\
| * connect: let callers know if connection is a socketJeff King2011-05-161-0/+1
* | Merge branch 'jc/index-update-if-able' into maintJunio C Hamano2011-04-031-0/+1
|\ \
| * | diff/status: refactor opportunistic index updateJunio C Hamano2011-03-211-0/+1
* | | Merge branch 'lt/default-abbrev' into maintJunio C Hamano2011-04-031-2/+3
|\ \ \
| * | | Make the default abbrev length configurableLinus Torvalds2011-03-111-2/+3
* | | | Merge branch 'lp/config-vername-check' into maintJunio C Hamano2011-04-031-0/+1
|\ \ \ \
| * | | | Sanity-check config variable namesLibor Pechacek2011-02-221-0/+1
| |/ / /
* | | | Merge branch 'sp/maint-fd-limit' into maintJunio C Hamano2011-03-201-1/+2
|\ \ \ \
| * | | | sha1_file.c: Don't retain open fds on small packsShawn O. Pearce2011-03-021-1/+2
* | | | | Merge branch 'jh/push-default-upstream-configname' into maintJunio C Hamano2011-03-161-1/+1
|\ \ \ \ \
| * | | | | push.default: Rename 'tracking' to 'upstream'Johan Herland2011-02-161-1/+1
| | |/ / / | |/| | |
* | | | | enums: omit trailing comma for portabilityJonathan Nieder2011-03-161-1/+1
* | | | | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"Junio C Hamano2011-03-101-1/+0
| |/ / / |/| | |
* | | | correct type of EMPTY_TREE_SHA1_BINJonathan Nieder2011-02-141-1/+3
|/ / /
* | | Merge branch 'nd/setup'Junio C Hamano2010-12-281-0/+2
|\ \ \
| * | | Remove all logic from get_git_work_tree()Nguyễn Thái Ngọc Duy2010-12-221-1/+0
| * | | setup: limit get_git_work_tree()'s to explicit setup case onlyNguyễn Thái Ngọc Duy2010-12-221-0/+1
| * | | Add git_config_early()Nguyễn Thái Ngọc Duy2010-12-221-0/+1
| * | | builtins: print setup info if repo is foundNguyễn Thái Ngọc Duy2010-11-291-0/+1
* | | | Merge branch 'nd/maint-fix-add-typo-detection'Junio C Hamano2010-12-221-13/+13
|\ \ \ \
| * | | | unpack-trees: move all skip-worktree checks back to unpack_trees()Nguyễn Thái Ngọc Duy2010-11-291-0/+1
| * | | | cache.h: realign and use (1 << x) form for CE_* constantsNguyễn Thái Ngọc Duy2010-11-291-13/+12
| |/ / /
* | | | Merge branch 'nd/extended-sha1-relpath'Junio C Hamano2010-12-161-1/+1
|\ \ \ \
| * | | | Make prefix_path() return char* without constNguyễn Thái Ngọc Duy2010-12-071-1/+1
* | | | | Merge branch 'jn/parse-options-extra'Junio C Hamano2010-12-121-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | setup: save prefix (original cwd relative to toplevel) in startup_infoNguyễn Thái Ngọc Duy2010-12-071-0/+1
| |/ / /
* | | | Merge branch 'js/configurable-tab'Junio C Hamano2010-12-121-7/+10
|\ \ \ \
| * | | | Make the tab width used for whitespace checks configurableJohannes Sixt2010-12-011-7/+10
| |/ / /
* | | | Merge branch 'pn/commit-autosquash'Junio C Hamano2010-12-031-0/+3
|\ \ \ \
| * | | | commit: helper methods to reduce redundant blocks of codePat Notz2010-11-041-0/+3
* | | | | Merge branch 'jc/abbrev-guard'Junio C Hamano2010-12-031-0/+1
|\ \ \ \ \
| * | | | | core.abbrevguard: Ensure short object names stay unique a bit longerJunio C Hamano2010-10-281-0/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'cb/leading-path-removal'Junio C Hamano2010-11-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | do not overwrite files in leading pathClemens Buchacher2010-10-131-1/+1
| |/ / /
* | | | Documentation: No argument of ALLOC_GROW should have side-effectsJonathan Nieder2010-10-081-1/+1
|/ / /
* | | 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
| |/ /