summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tg/ce-namelen-field'Junio C Hamano2012-07-231-13/+6
|\
| * Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer2012-07-111-13/+6
* | Merge branch 'jc/sha1-name-more'Junio C Hamano2012-07-221-10/+18
|\ \
| * | rev-parse --disambiguate=<prefix>Junio C Hamano2012-07-091-0/+3
| * | sha1_name.c: add support for disambiguating other typesJunio C Hamano2012-07-091-3/+10
| * | sha1_name.c: introduce get_sha1_committish()Junio C Hamano2012-07-091-0/+1
| * | sha1_name.c: teach lookup context to get_sha1_with_context()Junio C Hamano2012-07-091-1/+2
| * | sha1_name.c: many short names can only be committishJunio C Hamano2012-07-091-0/+1
| * | sha1_name.c: teach get_short_sha1() a commit-only optionJunio C Hamano2012-07-031-0/+1
| * | sha1_name.c: allow get_short_sha1() to take other flagsJunio C Hamano2012-07-031-0/+2
| * | sha1_name.c: get rid of get_sha1_with_mode()Junio C Hamano2012-07-031-1/+0
| * | sha1_name.c: get rid of get_sha1_with_mode_1()Junio C Hamano2012-07-031-5/+2
| * | sha1_name.c: hide get_sha1_with_context_1() uglinessJunio C Hamano2012-07-021-5/+1
* | | Merge branch 'tb/sanitize-decomposed-utf-8-pathname'Junio C Hamano2012-07-131-0/+1
|\ \ \ | |_|/ |/| |
| * | git on Mac OS and precomposed unicodeTorsten Bögershausen2012-07-081-0/+1
* | | Merge branch 'mm/config-xdg'Junio C Hamano2012-07-091-0/+3
|\ \ \
| * | | config: read (but not write) from $XDG_CONFIG_HOME/git/config fileHuynh Khoi Nguyen Nguyen2012-06-251-0/+3
| |/ /
* | | Merge branch 'th/diff-no-index-fixes'Junio C Hamano2012-07-041-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'Junio C Hamano2012-06-281-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
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |