From: Junio C Hamano <junkio@cox.net>
Date: Sat, 25 Nov 2006 09:04:54 +0000 (-0800)
Subject: Merge branch 'master' into jc/globfetch
X-Git-Tag: v1.5.0-rc0~181^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cadd8a7d4dad0a29a9b38b33979e7137adaf62cf;p=git.git

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
---

cadd8a7d4dad0a29a9b38b33979e7137adaf62cf