aboutsummaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAge
* Merge branch 'sp/maint-dumb-http-pack-reidx' into maintJunio C Hamano2010-06-16
|\
| * Allow parse_pack_index on temporary filesShawn O. Pearce2010-04-19
| * Introduce close_pack_index to permit replacementShawn O. Pearce2010-04-19
| * Merge branch 'gb/maint-submodule-env' into maintJunio C Hamano2010-03-08
| |\
| * \ Merge branch 'mm/mkstemps-mode-for-packfiles' into maintJunio C Hamano2010-03-08
| |\ \
* | | | fix const-correctness of write_sha1_fileJeff King2010-04-01
* | | | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-28
|\ \ \ \
| * | | | builtin/merge: make checkout_fast_forward() non staticJunio C Hamano2010-03-06
| |/ / /
* | | | Merge branch 'tr/notes-display'Junio C Hamano2010-03-24
|\ \ \ \
| * | | | notes: implement helpers needed for note copying during rewriteThomas Rast2010-03-12
| * | | | Support showing notes from more than one notes treeThomas Rast2010-03-12
* | | | | Merge branch 'fl/askpass'Junio C Hamano2010-03-20
|\ \ \ \ \
| * | | | | git-core: Support retrieving passwords with GIT_ASKPASSFrank Li2010-03-04
* | | | | | Merge branch 'gb/maint-submodule-env'Junio C Hamano2010-03-07
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Refactor list of of repo-local env varsGiuseppe Bilotta2010-02-24
| |/ / / /
* | | | | Merge branch 'nd/root-git'Junio C Hamano2010-03-07
|\ \ \ \ \
| * | | | | Move offset_1st_component() to path.cNguyễn Thái Ngọc Duy2010-02-16
| * | | | | Merge branch 'jc/maint-reflog-bad-timestamp' into maintJunio C Hamano2010-02-10
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'mm/mkstemps-mode-for-packfiles'Junio C Hamano2010-03-07
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.Matthieu Moy2010-02-22
| | |_|/ / | |/| | |
* | | | | Make 'git var GIT_PAGER' always print the configured pagerJonathan Nieder2010-02-14
|/ / / /
* | | | Merge branch 'jc/maint-reflog-bad-timestamp'Junio C Hamano2010-01-27
|\ \ \ \ | | |/ / | |/| |
| * | | approxidate_careful() reports errorneous date stringJunio C Hamano2010-01-26
| * | | Merge branch 'mm/config-pathname-tilde-expand' into maintJunio C Hamano2009-12-03
| |\ \ \
| * \ \ \ Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano2009-11-15
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-24
|\ \ \ \ \ \
| * | | | | | unpack-trees.c: prepare for looking ahead in the indexJunio C Hamano2010-01-07
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'il/branch-set-upstream'Junio C Hamano2010-01-22
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add branch --set-upstreamIlari Liusvaara2010-01-18
* | | | | | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-20
|\ \ \ \ \ \
| * | | | | | Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-17
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/cache-unmerge'Junio C Hamano2010-01-20
|\ \ \ \ \ \
| * | | | | | resolve-undo: teach "update-index --unresolve" to use resolve-undo infoJunio C Hamano2009-12-25
| * | | | | | resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano2009-12-25
| * | | | | | resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano2009-12-25
| |/ / / / /
* | | | | | Merge branch 'jc/ident'Junio C Hamano2010-01-20
|\ \ \ \ \ \
| * | | | | | user_ident_sufficiently_given(): refactor the logic to be usable from elsewhereJunio C Hamano2010-01-17
| * | | | | | ident.c: check explicit identity for name and email separatelyJunio C Hamano2010-01-10
| |/ / / / /
* | | | | | Merge branch 'jc/symbol-static'Junio C Hamano2010-01-20
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | symlinks.c: remove unused functionsJunio C Hamano2010-01-17
| * | | | | sha1_file.c: remove unused functionJunio C Hamano2010-01-12
| * | | | | read-cache.c: mark file-local functions staticJunio C Hamano2010-01-12
| * | | | | entry.c: mark file-local function staticJunio C Hamano2010-01-12
* | | | | | Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-13
|\ \ \ \ \ \
| * | | | | | "checkout A...B" switches to the merge base between A and BJunio C Hamano2009-10-18
* | | | | | | Merge branch 'cc/reset-more'Junio C Hamano2010-01-13
|\ \ \ \ \ \ \
| * | | | | | | Fix bit assignment for CE_CONFLICTEDJunio C Hamano2010-01-04
| * | | | | | | "reset --merge": fix unmerged caseJunio C Hamano2010-01-03
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'nd/sparse'Junio C Hamano2010-01-13
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDNguyễn Thái Ngọc Duy2009-12-14