projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fb257bf 19d122b)
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)
commitcc77b996120c548fd52799eee28c802358e260a7
tree5769811c5666798bc619753b5ca3f6f287c0a791tree | snapshot
parentfb257bfa174b00e236ac5d6f4282a487f10a9e98commit | diff
parent19d122bf1b119a759267076fead332fb857af87ecommit | diff
Merge branch 'pt/pull-tags-error-diag'

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.