Merge branch 'ar/config-from-command-line'

* ar/config-from-command-line:
  Complete prototype of git_config_from_parameters()
  Use strbufs instead of open-coded string manipulation
  Allow passing of configuration parameters in the command line

diff --cc Documentation/git.txt
Simple merge

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge