Merge branch 'dl/branch-error-message'

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"

Junio C Hamano committed May 22, 2015 at 12:41 UTC 086d0d4ab6c9f2b6f789a16157c1a3685514efb3

No changes.