Merge branch 'dl/branch-error-message'
commit086d0d4ab6c9f2b6f789a16157c1a3685514efb3
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:41 +0000 (22 12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:41 +0000 (22 12:41 -0700)
treeafc387cd3832fd1585a5c5ccbf5639dfb58ea731
parent6c1249c503f39ca45ca5b183527b22192cdaf7a7
parentccd593cffaa020ff767860ec211462b8dbd727a6
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"
builtin/branch.c