diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:58:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:58:53 -0700 |
| commit | 9a92cd1ce60babd661080f2b6a54f57fbfe133ae (patch) | |
| tree | 2bd4fb36fbc1fd793e287effc1cf7a45ad3c8ec2 /parse-options-cb.c | |
| parent | Merge branch 'jk/fetch-always-update-tracking' (diff) | |
| parent | strbuf_branchname(): do not double-expand @{-1}~22 (diff) | |
| download | tgif-9a92cd1ce60babd661080f2b6a54f57fbfe133ae.tar.xz | |
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
Diffstat (limited to 'parse-options-cb.c')
0 files changed, 0 insertions, 0 deletions