From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Apr 2012 21:41:08 +0000 (-0700)
Subject: Merge branch 'zj/upstream-error-message'
X-Git-Tag: v1.7.11-rc0~106
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=803090bef73bea178ea98a80d9a692530ac30d91;p=git.git

Merge branch 'zj/upstream-error-message'

Error message given when @{u} is used for a branch without its
upstream configured have been clatified.

By Zbigniew Jędrzejewski-Szmek
* zj/upstream-error-message:
  i18n: mark @{upstream} error messages for translation
  Be more specific if upstream branch is not tracked
  Provide better message for barnhc_wiht_tpyo@{u}
  Provide branch name in error message when using @{u}
  t1507: add tests to document @{upstream} behaviour
---

803090bef73bea178ea98a80d9a692530ac30d91