summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-04 22:21:52 -0800
committerJunio C Hamano <gitster@pobox.com>2012-03-04 22:21:52 -0800
commit91527e54d565e6fb6910fb3cb22f5915b5bd346e (patch)
treed86ee11ed880f6776cc192cbd1fec25e77064e22 /git-am.sh
parent38916c5b4740f6db09dc140a84bb470dfb582366 (diff)
parentead8eb8c1092ce2d94d70872946829a7a946ae9d (diff)
downloadgit-91527e54d565e6fb6910fb3cb22f5915b5bd346e.tar.gz
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
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions