summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'th/diff-no-index-fixes' into maintJunio C Hamano2012-07-111-0/+1
|\
| * diff: handle relative paths in no-indexJeff King2012-06-221-0/+1
| * Merge branch 'hv/submodule-alt-odb' into maintJunio C Hamano2012-05-251-0/+1
| |\
| * \ Merge branch 'ct/advise-push-default' into maintJunio C Hamano2012-05-111-1/+2
| |\ \
| * \ \ Merge branch 'jk/run-command-eacces' into maintJunio C Hamano2012-04-261-0/+2
| |\ \ \
| * \ \ \ Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano2012-04-261-0/+13
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano2012-04-261-0/+16
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'mm/verify-filename-fix' into maintJunio C Hamano2012-07-111-1/+3
|\ \ \ \ \ \ \
| * | | | | | | verify_filename(): ask the caller to chose the kind of diagnosisMatthieu Moy2012-06-181-1/+3
* | | | | | | | Merge branch 'jk/ident-gecos-strbuf'Junio C Hamano2012-05-291-6/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICTJeff King2012-05-241-1/+1
| * | | | | | | | ident: let callers omit name with fmt_indentJeff King2012-05-241-0/+1
| * | | | | | | | fmt_ident: drop IDENT_WARN_ON_NO_NAME codeJeff King2012-05-221-3/+2
| * | | | | | | | move git_default_* variables to ident.cJeff King2012-05-221-3/+0
| * | | | | | | | move identity config parsing to ident.cJeff King2012-05-221-0/+1
| * | | | | | | | ident: split setup_ident into separate functionsJeff King2012-05-221-0/+3
* | | | | | | | | Merge branch 'hv/submodule-alt-odb'Junio C Hamano2012-05-231-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | teach add_submodule_odb() to look for alternatesHeiko Voigt2012-05-141-0/+1
* | | | | | | | Merge branch 'nd/i18n'Junio C Hamano2012-05-021-4/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | i18n: mark relative dates for translationJonathan Nieder2012-04-241-4/+2
* | | | | | | | | Merge branch 'mm/simple-push'Junio C Hamano2012-05-021-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | push: introduce new push.default mode "simple"Matthieu Moy2012-04-241-0/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jc/index-v4'Junio C Hamano2012-05-021-48/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | read-cache.c: write prefix-compressed names in the indexJunio C Hamano2012-04-041-0/+4
| * | | | | | | | cache.h: hide on-disk index detailsJunio C Hamano2012-04-031-48/+0
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ct/advise-push-default'Junio C Hamano2012-04-201-1/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | clean up struct ref's nonfastforward fieldct/advise-push-defaultJeff King2012-03-261-4/+1
| * | | | | | | push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-191-2/+6
| |/ / / / / /
* | | | | | | Merge branch 'jk/run-command-eacces'Junio C Hamano2012-04-201-0/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | run-command: treat inaccessible directories as ENOENTJeff King2012-04-051-0/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-161-0/+13
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | make is_empty_blob_sha1 available everywhereJeff King2012-03-231-0/+13
| | |/ / / | |/| | |
* | | | | Merge branch 'jc/commit-hook-authorship'Junio C Hamano2012-04-151-0/+16
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | ident.c: add split_ident_line() to parse formatted ident lineJunio C Hamano2012-03-111-0/+16
| | |/ | |/|
* | | Merge branch 'jh/threadable-symlink-check'Junio C Hamano2012-03-061-0/+2
|\ \ \
| * | | Add threaded versions of functions in symlinks.c.jh/threadable-symlink-checkJared Hance2012-03-021-0/+2
| |/ /
| * | Merge branch 'jk/git-dir-lookup' into maintJunio C Hamano2012-02-211-0/+1
| |\ \
| * \ \ Merge branch 'zj/term-columns' into maintJunio C Hamano2012-02-211-0/+1
| |\ \ \
* | \ \ \ Merge branch 'jk/config-include'Junio C Hamano2012-02-231-1/+10
|\ \ \ \ \
| * | | | | config: add include directiveJeff King2012-02-171-1/+10
| * | | | | config: eliminate config_exclusive_filenameJeff King2012-02-171-2/+0
| * | | | | config: provide a version of git_config with more optionsJeff King2012-02-171-0/+1
| * | | | | config: teach git_config_rename_section a file argumentJeff King2012-02-171-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'zj/decimal-width'Junio C Hamano2012-02-201-0/+1
|\ \ \ \ \
| * | | | | make lineno_width() from blame reusable for otherszj/decimal-widthZbigniew Jędrzejewski-Szmek2012-02-141-0/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'zj/term-columns'Junio C Hamano2012-02-201-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | pager: find out the terminal width before spawning the pagerzj/term-columnsZbigniew Jędrzejewski-Szmek2012-02-131-0/+1
* | | | | Merge branch 'jk/git-dir-lookup'Junio C Hamano2012-02-141-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | standardize and improve lookup rules for external local reposjk/git-dir-lookupJeff King2012-02-021-0/+1
* | | | server_supports(): parse feature list more carefullyJunio C Hamano2012-01-081-0/+1
| |_|/ |/| |