Merge branch 'jc/pull'
* jc/pull: git-pull: reword "impossible to fast-forward" message. git-pull: further safety while on tracking branch.
Junio C Hamano committed
Mar 23, 2006 at 23:47 UTC
bdaa085f8c33e75cf477ff6b4292f35c9c5f4c22
No changes.