#version-control

How do I rename a local Git branch?

To rename the current branch: git branch -m <newname> To rename a branch while pointed to any branch: git branch -m <oldname> <newname> -m is short for --move. To push the local branch and reset the upstream branch: git push origin -u <newname> To delete the remote branch: git push origin --delete <oldname> To create a git rename alias: git config --global alias.rename 'branch -m' On…

How do I delete a Git branch locally and remotely?

Executive Summary git push -d <remote_name> <branchname> git branch -d <branchname> Note: In most cases, <remote_name> will be origin. Delete Local Branch To delete the local branch use one of the following: git branch -d <branch_name> git branch -D <branch_name> The -d option is an alias for --delete, which only deletes the branch if it has already been fully merged in its upstream…

Ooops… Time Travel with Git!

Last week, I started a new project.  After a good three hours of work, I was done for the day and pleased with my progress. I made a git repository and prepared to commit my progress. I added all my work (which was everything) to the staging area. And then, for reasons I can’t remember nor fathom, I typed the command git reset --hard. I believe I just wanted to clear out the staging area. Of…