Need to reset git branch to origin version

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

Related Posts:

  1. What is git tag, How to create tags & How to checkout git remote tag(s)
  2. What is the best (and safest) way to merge a Git branch into master?
  3. How can I switch to another branch in git?
  4. Squash my last X commits together using Git
  5. How to apply a patch generated with git format-patch?
  6. Abort a Git Merge
  7. GitHub: Permission denied (publickey). fatal: Could not read from remote repository
  8. How to delete a remote tag?
  9. Updates were rejected because the tip of your current branch is behind its remote counterpart
  10. Updates were rejected because the tip of your current branch is behind its remote counterpart
  11. git stash apply version
  12. Git fetch remote branch
  13. Updating a local repository with changes from a GitHub repository
  14. How do I remove a submodule?
  15. Git push results in “Authentication Failed”
  16. Git push results in “Authentication Failed”
  17. Download single files from GitHub
  18. Undoing a git rebase
  19. How to resolve merge conflicts in a Git repository
  20. Ignoring directories in Git repositories on Windows
  21. How can I merge multiple commits onto another branch as a single squashed commit?
  22. How to find my GitHub username so that I can be found via the URL?
  23. Create Git branch with current changes
  24. github website publish cannot publish unborn HEAD
  25. The following untracked working tree files would be overwritten by merge, but I don’t care
  26. Why do I have to “git push –set-upstream origin “?
  27. How do you create a remote Git branch?
  28. Move the most recent commit(s) to a new branch with Git
  29. How do I resolve git saying “Commit your changes or stash them before you can merge”?
  30. rejected master -> master (non-fast-forward)
  31. How do you stash an untracked file?
  32. How to name and retrieve a stash by name in git?
  33. Create a tag in a GitHub repository
  34. Filename too long in Git for Windows
  35. What is the difference between git rm –cached and git reset ?
  36. How can I delete a file from a Git repository?
  37. Git: Could not resolve host github.com error while cloning remote repository in git
  38. What does git rev-parse do?
  39. Make an existing Git branch track a remote branch?
  40. git – pulling from specific branch
  41. GitHub: invalid username or password
  42. Why do I have to “git push –set-upstream origin “?
  43. Stash just a single file
  44. How can I reset or revert a file to a specific revision?
  45. How do I provide a username and password when running “git clone [email protected]”?
  46. “*** Please tell me who you are.” when using SSH key
  47. master branch and ‘origin/master’ have diverged, how to ‘undiverge’ branches’?
  48. Pull request vs Merge request
  49. What is the difference between `git merge` and `git merge –no-ff`?
  50. git pull from master into the development branch
  51. Clone A Private Repository (Github)
  52. Is there a “theirs” version of “git merge -s ours”?
  53. Your configuration specifies to merge with the from the remote, but no such ref was fetched.?
  54. How to clone a specific Git tag
  55. ! [rejected] master -> master (fetch first)
  56. How to git add a whole folder
  57. Git how to clone with SSH key, username
  58. Heroku: How to change a Git remote on Heroku
  59. Updates were rejected because the remote contains work that you do not have locally
  60. fatal: This operation must be run in a work tree
  61. Undoing a ‘git push’
  62. How to replace local branch with remote branch entirely in Git?
  63. Git diff against a stash
  64. What’s the significance of the “No newline at end of file” log?
  65. How to revert a “git rm -r .”?
  66. Git update submodules recursively
  67. Do a “git export” (like “svn export”)?
  68. What does git push origin HEAD mean?
  69. How do I set up Eclipse/EGit with GitHub?
  70. Repository size limits for GitHub.com
  71. How do I push a local Git branch to master branch in the remote?
  72. How to clone git repository with specific revision/changeset?
  73. How to compare a local Git branch with its remote branch
  74. git push origin master does not work
  75. Found a swap file by the name
  76. Git clone verbose output?
  77. Could not create work tree dir ‘example.com’.: Permission denied
  78. Is there a git-merge –dry-run option?
  79. How to answer the git prompt in npm init for a local repo
  80. failed to push some refs to [email protected]
  81. How to update Git clone
  82. Git says “Automatic merge failed”, what does it mean?
  83. Sourcetree adding files in global .gitignore, not in repository .gitignore
  84. git pull remote branch cannot find remote ref
  85. How to configure git bash command line completion?
  86. How to stop tracking and ignore changes to a file in Git?
  87. Git Push Error: insufficient permission for adding an object to repository database
  88. Git push requires username and password
  89. WordPress Git Workflow Help
  90. WordPress and Git – What folders should I track?
  91. Pull latest stable release via git [closed]
  92. Why do the Roots theme CSS files not load (404)?
  93. Version control with a team of non-developers
  94. Painless way to track remote Git repo for WordPress updates
  95. Questions about Git and WordPress [duplicate]
  96. WordPress on git – need help with configuration
  97. What’s is the best stack for cPanel continuous deployment?
  98. How to tell which local branch is tracking which remote branch in Git?
  99. How to retrieve the last modification date of all files in a Git repository
  100. How do I edit git’s history to correct an incorrect email address/name [closed]

Leave a Comment

tech