Merge branch 'jc/pull'
commitbdaa085f8c33e75cf477ff6b4292f35c9c5f4c22
authorJunio C Hamano <junkio@cox.net>
Fri, 24 Mar 2006 07:47:32 +0000 (23 23:47 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 24 Mar 2006 07:47:32 +0000 (23 23:47 -0800)
treed86399b24c7f85c94664b114037512bc9cbdc66e
parent9bc8b776c54e9b4c3b753639b4ae70acb2ff8db6
parent8323124afe49353e09d041eb8ed3be4c2477c180
Merge branch 'jc/pull'

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