]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6998d89 19d122b)
Merge branch 'pt/pull-tags-error-diag' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2015 18:02:12 +0000 (11:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2015 18:02:12 +0000 (11:02 -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 patch | diff1 | diff2 | blob | history

diff --cc git-pull.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.