summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-23 13:30:14 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-23 13:30:14 -0800
commitfd1727f5fa1ca1817eee36f99c9245dc2217ecac (patch)
tree20f7bbc16c723bf42a6736f6719b22d5db06b30f /git-rebase--merge.sh
parent883a2a35043ca4eb238c92e94a66bd04a1fb833a (diff)
parent9b25a0b52e09400719366f0a33d0d0da98bbf7b0 (diff)
downloadgit-fd1727f5fa1ca1817eee36f99c9245dc2217ecac.tar.gz
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
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions