ChatGPT解决这个技术问题 Extra ChatGPT

How do I rename both a Git local and remote branch name?

I have four branches like master -> origin/regacy, FeatureA -> origin/FeatureA. As you can see, I typed the wrong name.

So I want to rename a remote branch name (origin/regacy → origin/legacy or origin/master)

I try the command below:

git remote rename regacy legacy

But Git console returned an error message to me.

 error : Could not rename config section 'remote.regacy' to 'remote.legacy'

How can I solve this problem?

Possible duplicate of How do I rename a local Git branch?
In short: 1. Checkout to the local branch, 2. git branch -M new-name 3. git push -d origin old-name 4. git push -u origin new-name.

A
Adam Burley

https://i.stack.imgur.com/YeBYR.jpg

There are a few ways to accomplish that:

Change your local branch and then push your changes Push the branch to remote with the new name while keeping the original name locally

Renaming local and remote

# Rename the local branch to the new name
git branch -m <old_name> <new_name>

# Delete the old branch on remote - where <remote> is, for example, origin
git push <remote> --delete <old_name>

# Or shorter way to delete remote branch [:]
git push <remote> :<old_name>

# Prevent git from using the old name when pushing in the next step.
# Otherwise, git will use the old upstream name instead of <new_name>.
git branch --unset-upstream <new_name>

# Push the new branch to remote
git push <remote> <new_name>

# Reset the upstream branch for the new_name local branch
git push <remote> -u <new_name>

https://i.stack.imgur.com/YOHON.png

Renaming Only remote branch

Credit: ptim

# In this option, we will push the branch to the remote with the new name
# While keeping the local name as is
git push <remote> <remote>/<old_name>:refs/heads/<new_name> :<old_name>

Important note:

When you use the git branch -m (move), Git is also updating your tracking branch with the new name.

git remote rename legacy legacy

git remote rename is trying to update your remote section in your configuration file. It will rename the remote with the given name to the new name, but in your case, it did not find any, so the renaming failed.

But it will not do what you think; it will rename your local configuration remote name and not the remote branch.

Note Git servers might allow you to rename Git branches using the web interface or external programs (like Sourcetree, etc.), but you have to keep in mind that in Git all the work is done locally, so it's recommended to use the above commands to the work.


Dont forget to unset the old upstream: git checkout <new_name> ; git branch --unset-upstream
@MiguelPing's comment is important. When trying to rename a branch I've already pushed to github, deleting, renaming local, it and re-pushing results in the old name being used again. If I --unset-upstream before re-pushing, it works as intended.
Is there a way to avoid automatic closure of the open PRs on the old-name branch on the remote? Faced this in gitlab, where the PR on the old branch name was closed after pushing to origin.
Here is a single-command version of this: OLD=<old>; NEW=<new>; REMOTE=<remote>; git branch -m $OLD $NEW && git push $REMOTE --delete $OLD && git push $REMOTE $NEW && git push $REMOTE -u $NEW
@JimArcher yes because you need to use the new name rather than old name. I changed it but the original author changed it back without explanation.
D
Dr1Ku

If you have named a branch incorrectly AND pushed this to the remote repository follow these steps to rename that branch (based on this article):

Rename your local branch: If you are on the branch you want to rename: git branch -m new-name If you are on a different branch: git branch -m old-name new-name Delete the old-name remote branch and push the new-name local branch: git push origin :old-name new-name Reset the upstream branch for the new-name local branch: Switch to the branch and then: git push origin -u new-name


After the first 2 steps, if you get an error message about the current branch points to a non-existence branch on the remote repo, the 3rd step fixes this
@Dr1Ku Need to know the difference between git push <remote> --delete old_name & git push origin :old-name new-name to delete a branch.
BitBucket users: fix error on Step 2 if renaming master, in Repo Details set the default branch to new branch. The error is: By default, deleting the current branch is denied, because the next 'git clone' won't result in any file checked out, causing confusion. You can set 'receive.denyDeleteCurrent' configuration variable to 'warn' or 'ignore' in the remote repository to allow deleting the current branch, with or without a warning message. To squelch this message, you can set it to 'refuse'. error: refusing to delete the current branch: refs/heads/master
easiest one among others
For Github and Bitbucket users, when you run Step 2, it will create the new remote branch, but you will see an error from the remote about "refusing to delete the current branch". So just go to Repository Settings ➔ Branches ➔ Change Default / Main Branch ➔ new_branch_name ➔ Save. Then run Step 2 again, so that it deletes the old remote branch name.
V
Vitalii Andrusishyn

Rename your local branch.

If you are on the branch you want to rename:

git branch -m new-name

if you stay on a different branch at the current time:

git branch -m old-name new-name

Delete the old-name remote branch and push the new-name local branch.

Stay on the target branch and:

git push origin :old-name new-name

Reset the upstream branch for the new-name local branch.

Switch to the target branch and then:

git push origin -u new-name

Your solution is simple and clear. Thank you @Vitaliy Andrusishyn for sharing your knowledge.
git push origin :old-name new-name closed my open PR. Careful if you have an ongoing discussion in your PR.
Before entering the git push origin :old-name new-name command, make sure your default remote branch is not set to the current branch you want to rename and delete
almost perfectly simple solution with sam-lahm and ekanem-eno warnings. Thanks guys.
E
Eric Aya

Check on which branch you are using the command below

git branch -a 

Checkout to the branch you want to rename

git checkout branch_to_rename

Rename the branch using

git branch -m new_name

Push the changes

git push origin :old_name new_name

P
Peter Mortensen

It seems that there is a direct way:

If you really just want to rename branches remotely (without renaming any local branches at the same time) you can do this with a single command like git push /:refs/heads/ : Renaming branches remotely in Git

See the original answer for more detail.


Didn't work in git 2.20.1 Deleted the old branch but the new one was not created.
P
Peter Mortensen

It can also be done the following way.

At first rename local branch, then remote branch.

Renaming the local branch:

If logged in another branch,

git branch -m old_branch new_branch 

If logged in the same branch,

git branch -m new_branch

Renaming remote branch:

git push origin :old_branch    // Delete the remote branch

git push --set-upstream origin new_branch   // Create a new remote branch

m
milesmeow

If you have already pushed the wrong name to remote, do the following:

Switch to the local branch you want to rename git checkout Rename the local branch git branch -m Push the local branch and reset the upstream branch git push origin -u Delete the remote branch git push origin --delete

This was based on this article.


a
avivamg

Attaching a Simple Snippet for renaming your current branch (local and on origin):

git branch -m <oldBranchName> <newBranchName>
git push origin :<oldBranchName>
git push --set-upstream origin <newBranchName>

Explanation from git docs:

git branch -m or -M option, will be renamed to . If had a corresponding reflog, it is renamed to match , and a reflog entry is created to remember the branch renaming. If exists, -M must be used to force the rename to happen. The special refspec : (or +: to allow non-fast-forward updates) directs Git to push "matching" branches: for every branch that exists on the local side, the remote side is updated if a branch of the same name already exists on the remote side. --set-upstream Set up 's tracking information so is considered 's upstream branch. If no is specified, then it defaults to the current branch.


v
vchan

Another workaround is the following:

Checkout to the branch you want to change Create a new branch from it Set upstream to remote Delete old branch from local and remote

More specifically:

# Checkout to the branch you want to rename
git checkout <old_branch_name>

# Create a new branch from the old one and checkout to it
git checkout -b <new_branch_name>

# Push the new branch to remote
git push -u <origin> HEAD

# Delete local branch
git branch -d <old_branch_name>

# Delete remote branch
git push <origin> -d <old_branch_name>

P
Peter Mortensen

There is no direct method,

Rename Local Branch, My current branch is master git branch -m master_renamed #master_renamed is new name of master Delete remote branch, git push origin --delete master #origin is remote_name Push renamed branch into remote, git push origin master_renamed

That's it...


Nice and simple and only 3 steps. Only improvement I can suggest is git push -u origin master_renamed to set the branch as a tracking branch
P
Peter Mortensen

This can be done even without renaming the local branch in three simple steps:

Go to your repository in GitHub Create a new branch from the old branch which you want to rename Delete the old branch


T
Tarik

I use these git alias and it pretty much does the job automatic:

git config --global alias.move '!git checkout master; git branch -m $1 $2; git status; git push --delete origin $1; git status; git push -u origin $2; git branch -a; exit;'

Usage: git move FROM_BRANCH TO_BRANCH

It works if you have the default names like master, origin etc. You can modify as you wish but it gives you the idea.


A
Anupam Maurya

Rename your local branch. If you are on the branch you want to rename: git branch -m new-name

If you are on a different branch:

git branch -m old-name new-name

Delete the old-name remote branch and push the new-name local branch. git push origin :old-name new-name Reset the upstream branch for the new-name local branch. Switch to the branch and then: git push origin -u new-name

All set!


S
Sebastian Viereck

I had to do the following task to rename local and remote branch:

# Rename the local branch to the new name
git branch -m <old_name> <new_name>

#  Delete the old remote branch
git push origin --delete <old_name>

# push to new remote branch - creates new remote branch
git push origin <new_name>

# set new remote branch as default remote branch for local branch
git branch --set-upstream-to=origin/<new_name> <new_name>

How is it different than existing answer?
E
Elifarley

If you want to use a single command to rename the current branch, like this:

git rename my-new-branch-name

Then, you have to create a file named git-rename, make it executable (chmod +x git-rename) and save it to a folder in your $PATH, containing this:

#!/bin/sh
currentBranch="$(git rev-parse --abbrev-ref HEAD)"
test $# != 1 && cat <<EOF && exit 1
Renames the current branch ($currentBranch) both locally and remotely.
USAGE:
git rename <new branch name>
EOF

newBranch="$1"; shift
git branch -m "$newBranch" && \
git push origin :"$currentBranch" "$newBranch"