Junio C Hamano 1f9a980636 Merge branch 'jk/maint-config-alias-fix' ...

* 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-30 20:19:14 -07:00

16 KiB

Raw Permalink Blame History

View Raw