Merge branch 'jc/config-doc-update'

Docfix.

* jc/config-doc-update:
  git-config.1: fix description of --regexp in synopsis
  git-config.1: --get-all description update

diff --cc Documentation/git-config.txt
Simple merge

diff --cc builtin/config.c
Simple merge