From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Jun 2013 22:58:53 +0000 (-0700)
Subject: Merge branch 'jc/strbuf-branchname-fix'
X-Git-Tag: v1.8.4-rc0~228
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a92cd1ce60babd661080f2b6a54f57fbfe133ae;p=thirdparty%2Fgit.git

Merge branch 'jc/strbuf-branchname-fix'

"git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22"
incorrectly when your previous branch was "frotz" (it should be
rewritten to "git merge frotz~22" instead).

* jc/strbuf-branchname-fix:
  strbuf_branchname(): do not double-expand @{-1}~22
---

9a92cd1ce60babd661080f2b6a54f57fbfe133ae