Delete Local Branch To delete the local branch use one of the following: $ git branch -d branch_name $ git branch -D branch_name Note: The -d option is an alias for --delete, which only deletes the branch if it has already been fully merged in its upstream branch. You could also use -D, which is an alias for --delete --force, which deletes the branch "irrespective of its … [Read more...]

While the first and selected answer is technically correct, there's the possibility you have not yet retrieved all objects and refs from the remote repository. If that is the case, you'll receive the following error: $ git checkout -b remote_branch origin/remote_branch fatal: git checkout: updating paths is incompatible with switching branches. Did you intend to checkout … [Read more...]

If you have any files that are not tracked by Git (e.g. uploaded user content), these files will not be affected. First, run a fetch to update all origin/<branch> refs to latest: git fetch --all Backup your current branch: git branch backup-master Then, you have two options: git reset --hard origin/master OR If you are on some other branch: git reset … [Read more...]

Undo a commit & redo $ git commit -m "Something terribly misguided" # (0: Your Accident) $ git reset HEAD~ # (1) [ edit files as necessary ] # (2) $ git add . # (3) $ git commit -c ORIG_HEAD # (4) This command is responsible for the undo. It will undo your … [Read more...]

You can undo git add before commit with git reset <file> which will remove it from the current index (the "about to be committed" list) without changing anything else. You can use git reset without any file name to unstage all due changes. This can come in handy when there are too many files to be listed one by one in a reasonable amount of time. In old … [Read more...]