diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-25 11:02:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-25 11:02:12 -0700 |
| commit | 6356003c80c744eefdd49d76bb587184d900228f (patch) | |
| tree | 5756fa0596e5911586c498bb0e18f1e5265f6c53 /git-difftool.perl | |
| parent | 6998d890c7120fe2d30fa0b6f80ddfaad716f632 (diff) | |
| parent | 19d122bf1b119a759267076fead332fb857af87e (diff) | |
| download | git-6356003c80c744eefdd49d76bb587184d900228f.tar.gz | |
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
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions