From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Mar 2009 21:29:03 +0000 (-0700)
Subject: Merge branch 'fc/parseopt-config'
X-Git-Tag: v1.6.3-rc0~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17e46ea6fea5273b51b424a8016f9da3412792d4;p=thirdparty%2Fgit.git

Merge branch 'fc/parseopt-config'

* fc/parseopt-config:
  config: test for --replace-all with one argument and fix documentation.
  config: set help text for --bool-or-int
  git config: don't allow --get-color* and variable type
  git config: don't allow extra arguments for -e or -l.
  git config: don't allow multiple variable types
  git config: don't allow multiple config file locations
  git config: reorganize to use parseopt
  git config: reorganize get_color*
  git config: trivial rename in preparation for parseopt
  git_config(): not having a per-repo config file is not an error
---

17e46ea6fea5273b51b424a8016f9da3412792d4