Junio C Hamano 25b86e45f4 Merge branch 'jk/maint-config-alias-fix' into next ...

* 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

Conflicts:
	config.c

2011-05-25 16:30:18 -07:00

16 KiB

Raw Blame History

View Raw