rebase: consistently use branch_name variable