Code

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)
This is to pick up the fix made on master:

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

1  2 
git-fetch.sh

diff --cc git-fetch.sh
Simple merge