From: Junio C Hamano <junkio@cox.net>
Date: Fri, 24 Mar 2006 07:47:32 +0000 (-0800)
Subject: Merge branch 'jc/pull'
X-Git-Tag: v1.3.0-rc1~1^2~8
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=bdaa085f8c33e75cf477ff6b4292f35c9c5f4c22;p=git.git

Merge branch 'jc/pull'

* jc/pull:
  git-pull: reword "impossible to fast-forward" message.
  git-pull: further safety while on tracking branch.
---

bdaa085f8c33e75cf477ff6b4292f35c9c5f4c22