From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Jun 2013 22:54:06 +0000 (-0700)
Subject: Merge branch 'vv/help-unknown-ref'
X-Git-Tag: v1.8.4-rc0~236
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1197c2298bd47c7046b57d92df2fd055051fbe99;p=thirdparty%2Fgit.git

Merge branch 'vv/help-unknown-ref'

Detect "git merge foo" that might have meant "git merge origin/foo"
and give an error message that is more specific than "foo is not
something we can merge".

* vv/help-unknown-ref:
  merge: use help_unknown_ref()
  help: add help_unknown_ref()
---

1197c2298bd47c7046b57d92df2fd055051fbe99