summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
|\ \ \
| * | | Add date formatting and parsing functions relative to a given timeAlex Riesen2009-08-301-0/+5
* | | | Merge branch 'mm/reset-report'Junio C Hamano2009-08-281-3/+3
|\ \ \ \
| * | | | reset: make the reminder output consistent with "checkout"Matthieu Moy2009-08-211-2/+2
| * | | | Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.Matthieu Moy2009-08-211-1/+1
| | |/ / | |/| |
* | | | Merge branch 'jc/maint-checkout-index-to-prefix'Junio C Hamano2009-08-251-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | check_path(): allow symlinked directories to checkout-index --prefixJunio C Hamano2009-08-181-1/+1
| |/ /
* | | Merge branch 'cc/replace'Junio C Hamano2009-08-211-1/+6
|\ \ \
| * | | environment: add global variable to disable replacementChristian Couder2009-05-311-0/+1
| * | | sha1_file: add a "read_sha1_file_repl" functionChristian Couder2009-05-311-1/+5
* | | | Merge branch 'gb/apply-ignore-whitespace'Junio C Hamano2009-08-211-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | git apply: option to ignore whitespace differencesGiuseppe Bilotta2009-08-051-0/+1
* | | | git-checkout: be careful about untracked symlinksLinus Torvalds2009-07-291-0/+3
|/ / /
* | | Merge branch 'js/maint-graft-unhide-true-parents'Junio C Hamano2009-07-251-0/+2
|\ \ \
| * | | git repack: keep commits hidden by a graftJohannes Schindelin2009-07-241-0/+2
| |/ /
* | | push: do not give big warning when no preference is configuredJunio C Hamano2009-07-181-1/+0
* | | Export thread-safe version of 'has_symlink_leading_path()'Linus Torvalds2009-07-091-0/+10
* | | diff: generate pretty filenames in prep_temp_blob()David Aguilar2009-05-311-0/+2
|/ /
* | Fix a bunch of pointer declarations (codestyle)Felipe Contreras2009-05-011-1/+1
* | Rename core.unreliableHardlinks to core.createObjectJohannes Schindelin2009-04-291-1/+6
* | Add an option not to use link(src, dest) && unlink(src) when that is unreliableJohannes Schindelin2009-04-251-0/+2
* | Merge branch 'jc/name-branch'Junio C Hamano2009-04-061-1/+1
|\ \
| * | Rename interpret/substitute nth_last_branch functionsJunio C Hamano2009-03-221-1/+1
View Lorry Controller Status