Merge branch 'jc/pull'
authorJunio C Hamano <junkio@cox.net>
Fri, 24 Mar 2006 07:47:32 +0000 (23:47 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 24 Mar 2006 07:47:32 +0000 (23:47 -0800)
* jc/pull:
  git-pull: reword "impossible to fast-forward" message.
  git-pull: further safety while on tracking branch.


Trivial merge