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 /t/t3031-merge-criscross.sh | |
| parent | Merge branch 'jk/color-diff-plain-is-context' into maint (diff) | |
| parent | pull: remove --tags error in no merge candidates case (diff) | |
| download | tgif-6356003c80c744eefdd49d76bb587184d900228f.tar.xz | |
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 't/t3031-merge-criscross.sh')
0 files changed, 0 insertions, 0 deletions