| commit | 803090bef73bea178ea98a80d9a692530ac30d91 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Apr 2012 21:41:08 +0000 (24 14:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Apr 2012 21:41:08 +0000 (24 14:41 -0700) | ||
| tree | 3f00b569ac548d41046240ad6bf275eb55aeebfc | treesnapshot (tar.gz zip) |
| parent | c6cfa5bbbba9eb4fb8d45d2ab942b1ebcb2bcb73 | commitdiff |
| parent | 647202889397e775c294234ebd3df8b2c4473f0f | commitdiff |
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
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