Merge branch 'maint'

* maint:
  Update draft release notes to 1.7.9.3 for the last time
  http.proxy: also mention https_proxy and all_proxy
  t0300: work around bug in dash 0.5.6
  t5512 (ls-remote): modernize style
  tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh

diff --cc Documentation/config.txt
Simple merge

diff --cc t/t0300-credentials.sh
index 8621ab036f91d0b7dcf96a1964611b8cafc3adbd,c1c8108148351ab3ec3db3f2615ff88f29d38974..20e28e34e7dc63aaf9ee9c6bdabcf311e0240615
--- 1/t/t0300-credentials.sh
--- 2/t/t0300-credentials.sh
+++ b/t/t0300-credentials.sh
@@@ -12,9 -14,11 +14,10 @@@ test_expect_success 'setup helper scrip
                echo >&2 "$whoami: $key=$value"
                eval "$key=$value"
        done
+       IFS=$OIFS
        EOF
  
 -      cat >git-credential-useless <<-\EOF &&
 -      #!/bin/sh
 +      write_script git-credential-useless <<-\EOF &&
        . ./dump
        exit 0
        EOF

diff --cc t/test-lib.sh
Simple merge