Merge branch 'jc/pull' into next
commitdcd0409fc545e881a61f522eb8f1d1a7e814eb94
authorJunio C Hamano <junkio@cox.net>
Wed, 22 Mar 2006 09:57:24 +0000 (22 01:57 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 22 Mar 2006 09:57:24 +0000 (22 01:57 -0800)
tree2ed0008ffb49a645cc46af10c72e069f71fc50cb
parent8ff8eea016f27d22d0264b140843470c7f14e004
parent8323124afe49353e09d041eb8ed3be4c2477c180
Merge branch 'jc/pull' into next

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