summaryrefslogtreecommitdiff
path: root/cache.h
AgeCommit message (Expand)Author
2010-01-21Merge branch 'ap/merge-backend-opts'Junio C Hamano
2010-01-20Merge branch 'jc/cache-unmerge'Junio C Hamano
2010-01-20Merge branch 'jc/ident'Junio C Hamano
2010-01-20Merge branch 'jc/symbol-static'Junio C Hamano
2010-01-18symlinks.c: remove unused functionsJunio C Hamano
2010-01-18Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano
2010-01-17user_ident_sufficiently_given(): refactor the logic to be usable from elsewhereJunio C Hamano
2010-01-13Merge branch 'jc/checkout-merge-base'Junio C Hamano
2010-01-13Merge branch 'cc/reset-more'Junio C Hamano
2010-01-13Merge branch 'nd/sparse'Junio C Hamano
2010-01-12sha1_file.c: remove unused functionJunio C Hamano
2010-01-12read-cache.c: mark file-local functions staticJunio C Hamano
2010-01-12entry.c: mark file-local function staticJunio C Hamano
2010-01-10ident.c: check explicit identity for name and email separatelyJunio C Hamano
2010-01-04Fix bit assignment for CE_CONFLICTEDJunio C Hamano
2010-01-04"reset --merge": fix unmerged caseJunio C Hamano
2009-12-26resolve-undo: teach "update-index --unresolve" to use resolve-undo infoJunio C Hamano
2009-12-26resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano
2009-12-26resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano
2009-12-14ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDNguyễn Thái Ngọc Duy
2009-12-07Detailed diagnosis when parsing an object name fails.Matthieu Moy
2009-11-24Merge branch 'cc/replace'Junio C Hamano
2009-11-23Merge branch 'mm/config-pathname-tilde-expand'Junio C Hamano
2009-11-23Merge branch 'tc/format-attribute'Junio C Hamano
2009-11-21Merge branch 'jh/notes' (early part)Junio C Hamano
2009-11-21Merge branch 'sp/smart-http'Junio C Hamano
2009-11-21Merge branch 'jn/editor-pager'Junio C Hamano
2009-11-21replace: use a GIT_NO_REPLACE_OBJECTS env variableChristian Couder
2009-11-18Expand ~ and ~user in core.excludesfile, commit.templateMatthieu Moy
2009-11-16Check the format of more printf-type functionsTarmigan Casebolt
2009-11-13Teach git var about GIT_PAGERJonathan Nieder
2009-11-13Teach git var about GIT_EDITORJonathan Nieder
2009-11-10http-backend: Protect GIT_PROJECT_ROOT from /../ requestsShawn O. Pearce
2009-10-31Move "get_ack()" back to fetch-packShawn O. Pearce
2009-10-20Introduce commit notesJohannes Schindelin
2009-10-18"checkout A...B" switches to the merge base between A and BJunio C Hamano
2009-10-18check_filename(): make verify_filename() callable without dyingJunio C Hamano
2009-10-17Merge branch 'jc/maint-blank-at-eof'Junio C Hamano
2009-09-29git branch -D: give a better error message when lockfile creation failsMiklos Vajna
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano
2009-09-13Merge branch 'jk/unwanted-advices'Junio C Hamano
2009-09-13preserve mtime of local cloneClemens Buchacher
2009-09-13use write_str_in_full helper to avoid literal string lengthsJim Meyering
2009-09-12push: make non-fast-forward help message configurableJeff King
2009-09-06core.whitespace: split trailing-space into blank-at-{eol,eof}Junio C Hamano
2009-09-04apply --whitespace=warn/error: diagnose blank at EOFJunio C Hamano
2009-09-01Merge branch 'lt/approxidate'Junio C Hamano
2009-08-31Add date formatting and parsing functions relative to a given timeAlex Riesen
2009-08-29Merge branch 'mm/reset-report'Junio C Hamano
2009-08-25Merge branch 'jc/maint-checkout-index-to-prefix'Junio C Hamano