From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 May 2015 19:41:56 +0000 (-0700)
Subject: Merge branch 'pt/pull-tags-error-diag'
X-Git-Tag: v2.5.0-rc0~85
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cc77b996120c548fd52799eee28c802358e260a7

Merge branch 'pt/pull-tags-error-diag'

There was a dead code that used to handle "git pull --tags" and
show special-cased error message, which was made irrelevant when
the semantics of the option changed back in Git 1.9 days.

* pt/pull-tags-error-diag:
pull: remove --tags error in no merge candidates case
---

cc77b996120c548fd52799eee28c802358e260a7