Need to reset git branch to origin version

by

If you haven’t pushed to origin yet, you can reset your branch to the upstream branch with:

git checkout mybranch
git reset --hard origin/mybranch

(Make sure that you reference your latest commit in a separate branch, like you mention in your question)

Note that just after the reset, mybranch@{1} refers to the old commit, before reset.

But if you had already pushed, see “Create git branch, and revert original to upstream state” for other options.

With Git 2.23 (August 2019), that would be one command: git switch.
Namely: git switch -C mybranch origin/mybranch

Example

C:\Users\vonc\git\git>git switch -C master origin/master
Reset branch 'master'
Branch 'master' set up to track remote branch 'master' from 'origin'.
Your branch is up to date with 'origin/master'.

That restores the index and working tree, like a git reset --hard would.

As commented by Brad Herman, a reset --hard would remove any new file or reset modified file to HEAD.

Actually, to be sure you start from a “clean slate”, a git clean -f -d after the reset would ensure a working tree exactly identical to the branch you just reset to.

This blog post suggests those aliases (for master branch only, but you can adapt/extend those):

[alias]
   resetorigin = !git fetch origin && git reset --hard origin/master && git clean -f -d
   resetupstream = !git fetch upstream && git reset --hard upstream/master && git clean -f -d

Then you can type:

git resetupstream

or

git resetorigin

More Related Contents:

  1. Move the most recent commit(s) to a new branch with Git
  2. How to delete a remote tag?
  3. Undoing a git rebase
  4. How do you create a remote Git branch?
  5. How do you clone a Git repository into a specific folder?
  6. How to list branches that contain a given commit?
  7. Is there a “theirs” version of “git merge -s ours”?
  8. Pushing to Git returning Error Code 403 fatal: HTTP request failed
  9. Is it possible to move/rename files in Git and maintain their history?
  10. How can I make git accept a self signed certificate?
  11. What is a tracking branch?
  12. git push says “everything up-to-date” even though I have local changes
  13. How to push to a non-bare Git repository?
  14. Git: how to renormalize line endings in all files in all revisions?
  15. git – skipping specific commits when merging
  16. I change the capitalization of a directory and Git doesn’t seem to pick up on it
  17. How to git fetch efficiently from a shallow clone
  18. Creating a new empty branch for a new project
  19. How to configure an existing git repo to be shared by a UNIX group
  20. How to detect a forced update
  21. How to see which commits in one branch aren’t in the other?
  22. Git – how to find first commit of specific branch
  23. git-checkout older revision of a file under a new name
  24. Git and nasty “error: cannot lock existing info/refs fatal”
  25. Setting up Git Server on Windows With git-http-backend.exe
  26. Connecting one Github repository to several Aptana projects
  27. Git: want to iterate through all commits on branch, and list files in each commit
  28. Restore git files deleted after git merge –abort
  29. How to pull remote branch from somebody else’s repo
  30. Limiting file size in git repository

Leave a Comment