Merge branch 'pt/pull-tags-error-diag' into next
commit6e1a5f1d1b28907793ad7ac749d75a99bc94aa37
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 May 2015 22:07:13 +0000 (20 15:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 May 2015 22:07:13 +0000 (20 15:07 -0700)
tree71008456bc576a553dde099ba6037c18730cf9bd
parent7ad2e9d9cea80893f00d6b65cfe6e4ed5f0ba0b3
parent19d122bf1b119a759267076fead332fb857af87e
Merge branch 'pt/pull-tags-error-diag' into next

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
git-pull.sh