summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | Merge branch 'fl/askpass'Junio C Hamano2010-03-201-0/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | git-core: Support retrieving passwords with GIT_ASKPASSFrank Li2010-03-041-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'gb/maint-submodule-env'Junio C Hamano2010-03-071-0/+9
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Refactor list of of repo-local env varsGiuseppe Bilotta2010-02-241-0/+9
| |/ / / /
* | | | | Merge branch 'nd/root-git'Junio C Hamano2010-03-071-0/+1
|\ \ \ \ \
| * | | | | Move offset_1st_component() to path.cNguyễn Thái Ngọc Duy2010-02-161-0/+1
| * | | | | Merge branch 'jc/maint-reflog-bad-timestamp' into maintJunio C Hamano2010-02-101-1/+2
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'mm/mkstemps-mode-for-packfiles'Junio C Hamano2010-03-071-0/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.Matthieu Moy2010-02-221-0/+4
| | |_|/ / | |/| | |
* | | | | Make 'git var GIT_PAGER' always print the configured pagerJonathan Nieder2010-02-141-1/+1
|/ / / /
* | | | Merge branch 'jc/maint-reflog-bad-timestamp'Junio C Hamano2010-01-271-1/+2
|\ \ \ \ | | |/ / | |/| |
| * | | approxidate_careful() reports errorneous date stringJunio C Hamano2010-01-261-1/+2
| * | | Merge branch 'mm/config-pathname-tilde-expand' into maintJunio C Hamano2009-12-031-0/+2
| |\ \ \
| * \ \ \ Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano2009-11-151-1/+3
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-241-0/+2
|\ \ \ \ \ \
| * | | | | | unpack-trees.c: prepare for looking ahead in the indexJunio C Hamano2010-01-071-0/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'il/branch-set-upstream'Junio C Hamano2010-01-221-0/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add branch --set-upstreamIlari Liusvaara2010-01-181-0/+1
* | | | | | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-201-0/+1
|\ \ \ \ \ \
| * | | | | | Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-171-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/cache-unmerge'Junio C Hamano2010-01-201-0/+4
|\ \ \ \ \ \