Merge branch 'jk/pull-rebase-using-fork-point'
commitd8cf714c0edf261a2bcc126fc240b10ed04a5b8d
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Jan 2014 20:04:29 +0000 (17 12:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Jan 2014 20:04:29 +0000 (17 12:04 -0800)
treed4a822512c1181ab20539ce04246c5adf77fe0e6
parent14598b907008dc9952428662a30ecfd74dc90a79
parentffc2b483dee43c2687088d4c73d7532fda855050
Merge branch 'jk/pull-rebase-using-fork-point'

Finishing touches so that an expected error message will not leak to
the UI.

* jk/pull-rebase-using-fork-point:
  pull: suppress error when no remoteref is found
git-pull.sh