summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | i18n: add no-op _() and N_() wrappersÆvar Arnfjörð Bjarmason2011-03-081-0/+1
* | | Merge branch 'jk/trace-sifter'Junio C Hamano2011-03-191-0/+5
|\ \ \
| * | | add packet tracing debug codeJeff King2011-03-081-0/+2
| * | | trace: add trace_strbufJeff King2011-03-081-0/+1
| * | | trace: factor out "do we want to trace" logicJeff King2011-03-081-0/+1
| * | | trace: refactor to support multiple env variablesJeff King2011-03-081-1/+1
| * | | trace: add trace_vprintfJeff King2011-03-081-0/+1
| |/ /
* | | Name make_*_path functions more accuratelyCarlos Martín Nieto2011-03-171-3/+3
* | | Merge branch 'maint'Junio C Hamano2011-03-161-1/+1
|\ \ \
| * \ \ Merge branch 'jh/push-default-upstream-configname' into maintJunio C Hamano2011-03-161-1/+1
| |\ \ \
| * | | | enums: omit trailing comma for portabilityJonathan Nieder2011-03-161-1/+1
* | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-03-161-3/+3
|\ \ \ \ \
| * | | | | declare 1-bit bitfields to be unsignedJonathan Nieder2011-03-151-3/+3
* | | | | | Merge branch 'sp/maint-fd-limit'Junio C Hamano2011-03-151-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | sha1_file.c: Don't retain open fds on small packsShawn O. Pearce2011-03-021-1/+2
* | | | | | Merge branch 'maint'Junio C Hamano2011-03-101-1/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"Junio C Hamano2011-03-101-1/+0
| |/ / / /
* | | | | Merge branch 'jh/push-default-upstream-configname'Junio C Hamano2011-02-271-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | push.default: Rename 'tracking' to 'upstream'Johan Herland2011-02-161-1/+1
* | | | | Merge branch 'lp/config-vername-check'Junio C Hamano2011-02-271-0/+1
|\ \ \ \ \
| * | | | | Sanity-check config variable namesLibor Pechacek2011-02-221-0/+1
| |/ / / /
* | | | | Merge branch 'nd/hash-object-sanity'Junio C Hamano2011-02-271-1/+1
|\ \ \ \ \
| * | | | | Make hash-object more robust against malformed objectsNguyễn Thái Ngọc Duy2011-02-071-1/+1
| |/ / / /
* | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-02-271-1/+16
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | Convert ce_path_match() to use struct pathspecNguyễn Thái Ngọc Duy2011-02-031-1/+1
| * | | tree_entry_interesting(): support wildcard matchingNguyễn Thái Ngọc Duy2011-02-031-0/+2
| * | | tree_entry_interesting(): support depth limitNguyễn Thái Ngọc Duy2011-02-031-0/+2
| * | | Add struct pathspecNguyễn Thái Ngọc Duy2011-02-031-0/+11
| |/ /
* | | update-index --refresh --porcelain: add missing constJonathan Nieder2011-02-221-1/+1
| |/ |/|
* | 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
|\ \ \