summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | resolve-undo: teach "update-index --unresolve" to use resolve-undo infoJunio C Hamano2009-12-251-0/+1
| * | resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano2009-12-251-0/+1
| * | resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano2009-12-251-0/+2
| |/
* | Merge branch 'jc/ident'Junio C Hamano2010-01-201-0/+4
|\ \
| * | user_ident_sufficiently_given(): refactor the logic to be usable from elsewhereJunio C Hamano2010-01-171-0/+1
| * | ident.c: check explicit identity for name and email separatelyJunio C Hamano2010-01-101-0/+3
| |/
* | Merge branch 'jc/symbol-static'Junio C Hamano2010-01-201-8/+0
|\ \
| * | symlinks.c: remove unused functionsJunio C Hamano2010-01-171-2/+0
| * | sha1_file.c: remove unused functionJunio C Hamano2010-01-121-1/+0
| * | read-cache.c: mark file-local functions staticJunio C Hamano2010-01-121-2/+0
| * | entry.c: mark file-local function staticJunio C Hamano2010-01-121-3/+0
* | | Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-131-0/+1
|\ \ \
| * | | "checkout A...B" switches to the merge base between A and BJunio C Hamano2009-10-181-0/+1
* | | | Merge branch 'cc/reset-more'Junio C Hamano2010-01-131-0/+1
|\ \ \ \
| * | | | Fix bit assignment for CE_CONFLICTEDJunio C Hamano2010-01-041-1/+1
| * | | | "reset --merge": fix unmerged caseJunio C Hamano2010-01-031-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'nd/sparse'Junio C Hamano2010-01-131-2/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDNguyễn Thái Ngọc Duy2009-12-141-1/+3
| * | | unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkoutNguyễn Thái Ngọc Duy2009-08-231-0/+1
| * | | unpack-trees(): add CE_WT_REMOVE to remove on worktree aloneNguyễn Thái Ngọc Duy2009-08-231-0/+3
| * | | Introduce "skip-worktree" bit in index, teach Git to get/set this bitNguyễn Thái Ngọc Duy2009-08-231-1/+3
* | | | Detailed diagnosis when parsing an object name fails.Matthieu Moy2009-12-071-1/+5
| |/ / |/| |
* | | Merge branch 'cc/replace'Junio C Hamano2009-11-231-0/+1
|\ \ \
| * | | replace: use a GIT_NO_REPLACE_OBJECTS env variableChristian Couder2009-11-201-0/+1
| | |/ | |/|
* | | Merge branch 'mm/config-pathname-tilde-expand'Junio C Hamano2009-11-221-0/+2
|\ \ \
| * | | Expand ~ and ~user in core.excludesfile, commit.templateMatthieu Moy2009-11-171-0/+2
* | | | Merge branch 'tc/format-attribute'Junio C Hamano2009-11-221-0/+2
|\ \ \ \
| * | | | Check the format of more printf-type functionsTarmigan Casebolt2009-11-151-0/+2
| | |/ / | |/| |
* | | | Merge branch 'jh/notes' (early part)Junio C Hamano2009-11-201-0/+4
|\ \ \ \
| * | | | Introduce commit notesJohannes Schindelin2009-10-191-0/+4
| | |/ / | |/| |
* | | | Merge branch 'sp/smart-http'Junio C Hamano2009-11-201-1/+1
|\ \ \ \
| * | | | http-backend: Protect GIT_PROJECT_ROOT from /../ requestsShawn O. Pearce2009-11-091-0/+1
| * | | | Move "get_ack()" back to fetch-packShawn O. Pearce2009-10-301-1/+0
| |/ / /
* | | | Merge branch 'jn/editor-pager'Junio C Hamano2009-11-201-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Teach git var about GIT_PAGERJonathan Nieder2009-11-131-0/+1
| * | | Teach git var about GIT_EDITORJonathan Nieder2009-11-131-0/+1
* | | | check_filename(): make verify_filename() callable without dyingJunio C Hamano2009-10-181-0/+1
|/ / /
* | | Merge branch 'jc/maint-blank-at-eof'Junio C Hamano2009-10-171-1/+3
|\ \ \ | |/ / |/| |
| * | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-151-1/+3
| |\ \ | | |/ | |/|
| | * core.whitespace: split trailing-space into blank-at-{eol,eof}Junio C Hamano2009-09-051-2/+3
| | * apply --whitespace=warn/error: diagnose blank at EOFJunio C Hamano2009-09-041-1/+2
* | | git branch -D: give a better error message when lockfile creation failsMiklos Vajna2009-09-291-0/+1
* | | Merge branch 'jk/unwanted-advices'Junio C Hamano2009-09-131-0/+1
|\ \ \
| * | | push: make non-fast-forward help message configurableJeff King2009-09-111-0/+1
* | | | preserve mtime of local cloneClemens Buchacher2009-09-131-0/+1
* | | | use write_str_in_full helper to avoid literal string lengthsJim Meyering2009-09-131-2/+7
|/ / /
* | | Merge branch 'lt/approxidate'Junio C Hamano2009-08-311-0/+5
|\ \ \
View Lorry Controller Status