From: Junio C Hamano Date: Wed, 22 Mar 2006 09:57:24 +0000 (-0800) Subject: Merge branch 'jc/pull' into next X-Git-Tag: v1.3.0-rc1~10 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=dcd0409fc545e881a61f522eb8f1d1a7e814eb94;p=git.git Merge branch 'jc/pull' into next * jc/pull: git-pull: reword "impossible to fast-forward" message. git-pull: further safety while on tracking branch. --- dcd0409fc545e881a61f522eb8f1d1a7e814eb94