Merge branch 'jc/pull' into next
* jc/pull: git-pull: reword "impossible to fast-forward" message. git-pull: further safety while on tracking branch.
Junio C Hamano committed
Mar 22, 2006 at 01:57 UTC
dcd0409fc545e881a61f522eb8f1d1a7e814eb94
No changes.