Merge branch 'master' into jc/globfetch
authorJunio C Hamano <junkio@cox.net>
Sat, 25 Nov 2006 09:04:54 +0000 (01:04 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 25 Nov 2006 09:07:15 +0000 (01:07 -0800)
commitcadd8a7d4dad0a29a9b38b33979e7137adaf62cf
tree2ed79a3d315629a6abd41ba103b846351dc1a0ac
parent5677882be721be5e2706a546d90804da8d8d0bd5
parentf64d7fd267c501f501e18a888e3e1e0c5b56458f
Merge branch 'master' into jc/globfetch

This is to pick up the fix made on master:

  git-fetch: exit with non-zero status when fast-forward check fails
git-fetch.sh