author | Junio C Hamano <gitster@pobox.com> | |
Thu, 23 Feb 2012 21:30:14 +0000 (13:30 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 23 Feb 2012 21:30:14 +0000 (13:30 -0800) | ||
commit | fd1727f5fa1ca1817eee36f99c9245dc2217ecac | |
tree | 20f7bbc16c723bf42a6736f6719b22d5db06b30f | tree | snapshot |
parent | 883a2a35043ca4eb238c92e94a66bd04a1fb833a | commit | diff |
parent | 9b25a0b52e09400719366f0a33d0d0da98bbf7b0 | commit | diff |
Merge branch 'jk/config-include'
* jk/config-include:
: An assignment to the include.path pseudo-variable causes the named file
: to be included in-place when Git looks up configuration variables.
config: add include directive
config: eliminate config_exclusive_filename
config: stop using config_exclusive_filename
config: provide a version of git_config with more options
config: teach git_config_rename_section a file argument
config: teach git_config_set_multivar_in_file a default path
config: copy the return value of prefix_filename
t1300: add missing &&-chaining
docs/api-config: minor clarifications
docs: add a basic description of the config API
* jk/config-include:
: An assignment to the include.path pseudo-variable causes the named file
: to be included in-place when Git looks up configuration variables.
config: add include directive
config: eliminate config_exclusive_filename
config: stop using config_exclusive_filename
config: provide a version of git_config with more options
config: teach git_config_rename_section a file argument
config: teach git_config_set_multivar_in_file a default path
config: copy the return value of prefix_filename
t1300: add missing &&-chaining
docs/api-config: minor clarifications
docs: add a basic description of the config API
cache.h | diff1 | | diff2 | | blob | history |