]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit6356003c80c744eefdd49d76bb587184d900228f
tree5756fa0596e5911586c498bb0e18f1e5265f6c53tree | snapshot
parent6998d890c7120fe2d30fa0b6f80ddfaad716f632commit | diff
parent19d122bf1b119a759267076fead332fb857af87ecommit | diff
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
git-pull.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.