From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jun 2015 18:02:12 +0000 (-0700)
Subject: Merge branch 'pt/pull-tags-error-diag' into maint
X-Git-Tag: v2.4.5~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6356003c80c744eefdd49d76bb587184d900228f;p=thirdparty%2Fgit.git

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

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
---

6356003c80c744eefdd49d76bb587184d900228f