aboutsummaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAge
* Merge branch 'gb/maint-submodule-env' into maintJunio C Hamano2010-03-08
|\
| * Refactor list of of repo-local env varsGiuseppe Bilotta2010-02-24
* | Merge branch 'mm/mkstemps-mode-for-packfiles' into maintJunio C Hamano2010-03-08
|\ \
| * | 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
| * | | | | | unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkoutNguyễn Thái Ngọc Duy2009-08-23
| * | | | | | unpack-trees(): add CE_WT_REMOVE to remove on worktree aloneNguyễn Thái Ngọc Duy2009-08-23
| * | | | | | Introduce "skip-worktree" bit in index, teach Git to get/set this bitNguyễn Thái Ngọc Duy2009-08-23
* | | | | | | Detailed diagnosis when parsing an object name fails.Matthieu Moy2009-12-07
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'cc/replace'Junio C Hamano2009-11-23
|\ \ \ \ \ \
| * | | | | | replace: use a GIT_NO_REPLACE_OBJECTS env variableChristian Couder2009-11-20
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mm/config-pathname-tilde-expand'Junio C Hamano2009-11-22
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Expand ~ and ~user in core.excludesfile, commit.templateMatthieu Moy2009-11-17
| | |_|/ / | |/| | |
* | | | | Merge branch 'tc/format-attribute'Junio C Hamano2009-11-22
|\ \ \ \ \
| * | | | | Check the format of more printf-type functionsTarmigan Casebolt2009-11-15
| | |/ / / | |/| | |
* | | | | Merge branch 'jh/notes' (early part)Junio C Hamano2009-11-20
|\ \ \ \ \
| * | | | | Introduce commit notesJohannes Schindelin2009-10-19
| | |/ / / | |/| | |
* | | | | Merge branch 'sp/smart-http'Junio C Hamano2009-11-20
|\ \ \ \ \
| * | | | | http-backend: Protect GIT_PROJECT_ROOT from /../ requestsShawn O. Pearce2009-11-09
| * | | | | Move "get_ack()" back to fetch-packShawn O. Pearce2009-10-30
| |/ / / /
* | | | | Merge branch 'jn/editor-pager'Junio C Hamano2009-11-20
|\ \ \ \ \ | |_|/ / / |/| | | |