]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'rr/die-on-missing-upstream'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:29:58 +0000 (13:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:29:59 +0000 (13:29 -0700)
When a reflog notation is used for implicit "current branch", we
did not say which branch and worse said "branch ''".

* rr/die-on-missing-upstream:
  sha1_name: fix error message for @{<N>}, @{<date>}
  sha1_name: fix error message for @{u}

1  2 
sha1_name.c

diff --cc sha1_name.c
Simple merge