summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-28 13:52:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-28 13:52:22 -0700
commit41534b626ebdf3fb4fb692749245b90ff2bb7e13 (patch)
tree6948d02d5cc525926a01cfa1b3434a67791a6122 /git-rebase--merge.sh
parentMerge branch 'ab/cond-skip-tests' into maint (diff)
parentcheckout: restrict @-expansions when finding branch (diff)
downloadtgif-41534b626ebdf3fb4fb692749245b90ff2bb7e13.tar.xz
Merge branch 'jk/interpret-branch-name' into maint
"git branch @" created refs/heads/@ as a branch, and in general the code that handled @{-1} and @{upstream} was a bit too loose in disambiguating. * jk/interpret-branch-name: checkout: restrict @-expansions when finding branch strbuf_check_ref_format(): expand only local branches branch: restrict @-expansions when deleting t3204: test git-branch @-expansion corner cases interpret_branch_name: allow callers to restrict expansions strbuf_branchname: add docstring strbuf_branchname: drop return value interpret_branch_name: move docstring to header file interpret_branch_name(): handle auto-namelen for @{-1}
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions