Merge branch 'pt/pull-tags-error-diag'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:56 +0000 (12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:56 +0000 (12:41 -0700)
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

1  2 
git-pull.sh
diff --cc git-pull.sh
Simple merge