tree 3990a3bc10cbb1b6ae90a135456b98ab00878110
parent c538004ccb643388020b0e362409e469ed50d054
parent ccd593cffaa020ff767860ec211462b8dbd727a6
author Junio C Hamano <gitster@pobox.com> 1433530829 -0700
committer Junio C Hamano <gitster@pobox.com> 1433530829 -0700

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"