| commit | 9a92cd1ce60babd661080f2b6a54f57fbfe133ae | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 2 Jun 2013 22:58:53 +0000 (2 15:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 2 Jun 2013 22:58:53 +0000 (2 15:58 -0700) | ||
| tree | 2bd4fb36fbc1fd793e287effc1cf7a45ad3c8ec2 | treesnapshot (tar.gz zip) |
| parent | db400949b31a5d2cec923b4c9da710fbdd52cca2 | commitdiff |
| parent | 84cf246670eab56a23ed5554ed084053a0f19f2d | commitdiff |
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
"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