Merge branch 'dl/branch-error-message' into next
commited947ab22afe292f25fcea523f66a25e4d6be9fc
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:52:08 +0000 (11 14:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:52:08 +0000 (11 14:52 -0700)
treefab681a9a243e04f43ca7f42417dd02e4e206263
parente0f5f4f343dbc2e0d4a46fad77b615d676bddd3f
parentccd593cffaa020ff767860ec211462b8dbd727a6
Merge branch 'dl/branch-error-message' into next

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