summaryrefslogtreecommitdiff
path: root/cache.h
AgeCommit message (Expand)AuthorFilesLines
2010-01-17Make "subtree" part more orthogonal to the rest of merge-recursive.Libravatar Junio C Hamano1-0/+1
2010-01-17user_ident_sufficiently_given(): refactor the logic to be usable from elsewhereLibravatar Junio C Hamano1-0/+1
2010-01-13Merge branch 'jc/checkout-merge-base'Libravatar Junio C Hamano1-0/+1
2010-01-13Merge branch 'cc/reset-more'Libravatar Junio C Hamano1-0/+1
2010-01-13Merge branch 'nd/sparse'Libravatar Junio C Hamano1-2/+10
2010-01-12sha1_file.c: remove unused functionLibravatar Junio C Hamano1-1/+0
2010-01-12read-cache.c: mark file-local functions staticLibravatar Junio C Hamano1-2/+0
2010-01-12entry.c: mark file-local function staticLibravatar Junio C Hamano1-3/+0
2010-01-10ident.c: check explicit identity for name and email separatelyLibravatar Junio C Hamano1-0/+3
2010-01-07unpack-trees.c: prepare for looking ahead in the indexLibravatar Junio C Hamano1-0/+2
2010-01-04Fix bit assignment for CE_CONFLICTEDLibravatar Junio C Hamano1-1/+1
2010-01-03"reset --merge": fix unmerged caseLibravatar Junio C Hamano1-0/+1
2009-12-25resolve-undo: teach "update-index --unresolve" to use resolve-undo infoLibravatar Junio C Hamano1-0/+1
2009-12-25resolve-undo: "checkout -m path" uses resolve-undo informationLibravatar Junio C Hamano1-0/+1
2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionLibravatar Junio C Hamano1-0/+2
2009-12-14ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDLibravatar Nguyễn Thái Ngọc Duy1-1/+3
2009-12-07Detailed diagnosis when parsing an object name fails.Libravatar Matthieu Moy1-1/+5
2009-12-03Merge branch 'mm/config-pathname-tilde-expand' into maintLibravatar Junio C Hamano1-0/+2
2009-11-23Merge branch 'cc/replace'Libravatar Junio C Hamano1-0/+1
2009-11-22Merge branch 'mm/config-pathname-tilde-expand'Libravatar Junio C Hamano1-0/+2
2009-11-22Merge branch 'tc/format-attribute'Libravatar Junio C Hamano1-0/+2
2009-11-20Merge branch 'jh/notes' (early part)Libravatar Junio C Hamano1-0/+4
2009-11-20Merge branch 'sp/smart-http'Libravatar Junio C Hamano1-1/+1
2009-11-20Merge branch 'jn/editor-pager'Libravatar Junio C Hamano1-0/+2
2009-11-20replace: use a GIT_NO_REPLACE_OBJECTS env variableLibravatar Christian Couder1-0/+1
2009-11-17Expand ~ and ~user in core.excludesfile, commit.templateLibravatar Matthieu Moy1-0/+2
2009-11-15Merge branch 'jc/maint-blank-at-eof' into maintLibravatar Junio C Hamano1-1/+3
2009-11-15Check the format of more printf-type functionsLibravatar Tarmigan Casebolt1-0/+2
2009-11-13Teach git var about GIT_PAGERLibravatar Jonathan Nieder1-0/+1
2009-11-13Teach git var about GIT_EDITORLibravatar Jonathan Nieder1-0/+1
2009-11-09http-backend: Protect GIT_PROJECT_ROOT from /../ requestsLibravatar Shawn O. Pearce1-0/+1
2009-10-30Move "get_ack()" back to fetch-packLibravatar Shawn O. Pearce1-1/+0
2009-10-19Introduce commit notesLibravatar Johannes Schindelin1-0/+4
2009-10-18"checkout A...B" switches to the merge base between A and BLibravatar Junio C Hamano1-0/+1
2009-10-18check_filename(): make verify_filename() callable without dyingLibravatar Junio C Hamano1-0/+1
2009-10-17Merge branch 'jc/maint-blank-at-eof'Libravatar Junio C Hamano1-1/+3
2009-09-29git branch -D: give a better error message when lockfile creation failsLibravatar Miklos Vajna1-0/+1
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Libravatar Junio C Hamano1-1/+3
2009-09-13Merge branch 'jk/unwanted-advices'Libravatar Junio C Hamano1-0/+1
2009-09-13preserve mtime of local cloneLibravatar Clemens Buchacher1-0/+1
2009-09-13use write_str_in_full helper to avoid literal string lengthsLibravatar Jim Meyering1-2/+7
2009-09-11push: make non-fast-forward help message configurableLibravatar Jeff King1-0/+1
2009-09-05core.whitespace: split trailing-space into blank-at-{eol,eof}Libravatar Junio C Hamano1-2/+3
2009-09-04apply --whitespace=warn/error: diagnose blank at EOFLibravatar Junio C Hamano1-1/+2
2009-08-31Merge branch 'lt/approxidate'Libravatar Junio C Hamano1-0/+5
2009-08-30Add date formatting and parsing functions relative to a given timeLibravatar Alex Riesen1-0/+5
2009-08-28Merge branch 'mm/reset-report'Libravatar Junio C Hamano1-3/+3
2009-08-25Merge branch 'jc/maint-checkout-index-to-prefix'Libravatar Junio C Hamano1-1/+1
2009-08-23unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkoutLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2009-08-23unpack-trees(): add CE_WT_REMOVE to remove on worktree aloneLibravatar Nguyễn Thái Ngọc Duy1-0/+3