Merge branch 'dl/branch-error-message' into maint
commitcbac7067a406380dd0061ecdd990a5e64ca88abf
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:29 +0000 (5 12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:29 +0000 (5 12:00 -0700)
tree3990a3bc10cbb1b6ae90a135456b98ab00878110
parentc538004ccb643388020b0e362409e469ed50d054
parentccd593cffaa020ff767860ec211462b8dbd727a6
Merge branch 'dl/branch-error-message' into maint

Error messages from "git branch" called remote-tracking branches as
"remote branches".

* dl/branch-error-message:
  branch: do not call a "remote-tracking branch" a "remote branch"
builtin/branch.c