tree fe3865b32c4690dce137a173d86f3876578cf02c
parent 6e1a7510b1dd830de69e174e409a40eb580c3ba7
parent 73546c085d49694c5e54b421f80bde6bc25006fb
author Junio C Hamano <gitster@pobox.com> 1306962322 -0700
committer Junio C Hamano <gitster@pobox.com> 1306962322 -0700

Merge branch 'jk/maint-config-alias-fix' into maint

* jk/maint-config-alias-fix:
  handle_options(): do not miscount how many arguments were used
  config: always parse GIT_CONFIG_PARAMETERS during git_config
  git_config: don't peek at global config_parameters
  config: make environment parsing routines static