Merge branch 'dl/branch-error-message' into maint
authorJunio C Hamano <redacted>
Fri, 5 Jun 2015 19:00:29 +0000 (12:00 -0700)
committerJunio C Hamano <redacted>
Fri, 5 Jun 2015 19:00:29 +0000 (12:00 -0700)
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"

1  2 
builtin/branch.c

Simple merge
git clone https://git.99rst.org/PROJECT