Code

Merge branch 'jk/maint-pass-c-config-in-env'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2010 16:17:00 +0000 (09:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2010 16:17:00 +0000 (09:17 -0700)
* jk/maint-pass-c-config-in-env:
  do not pass "git -c foo=bar" params to transport helpers
  pass "git -c foo=bar" params through environment

1  2 
cache.h
environment.c
git.c

diff --cc cache.h
Simple merge
diff --cc environment.c
Simple merge
diff --cc git.c
Simple merge