Merge part of jc/portable branch

diff --cc Makefile
Simple merge

diff --cc git-clone.sh
Simple merge

diff --cc git-merge.sh
Simple merge

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