Merge branch 'jc/pull' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 22 Mar 2006 09:57:24 +0000 (01:57 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 22 Mar 2006 09:57:24 +0000 (01:57 -0800)
* jc/pull:
  git-pull: reword "impossible to fast-forward" message.
  git-pull: further safety while on tracking branch.


Trivial merge