Git pull after forced update

by

To receive the new commits

git fetch

Reset

You can reset the commit for a local branch using git reset.

To change the commit of a local branch:

git reset origin/main --hard

Be careful though, as the documentation puts it:

Resets the index and working tree. Any changes to tracked files in the working tree since <commit> are discarded.

If you want to actually keep whatever changes you’ve got locally – do a --soft reset instead. Which will update the commit history for the branch, but not change any files in the working directory (and you can then commit them).

Rebase

You can replay your local commits on top of any other commit/branch using git rebase:

git rebase -i origin/main

This will invoke rebase in interactive mode where you can choose how to apply each individual commit that isn’t in the history you are rebasing on top of.

If the commits you removed (with git push -f) have already been pulled into the local history, they will be listed as commits that will be reapplied – they would need to be deleted as part of the rebase or they will simply be re-included into the history for the branch – and reappear in the remote history on the next push.

Use the help git command --help for more details and examples on any of the above (or other) commands.

More Related Contents:

  1. How do I force "git pull" to overwrite local files?
  2. Can “git pull” automatically stash and pop pending changes?
  3. Git push requires username and password
  4. Support for password authentication was removed. Please use a personal access token instead
  5. Merge, update, and pull Git branches without using checkouts
  6. Rename master branch for both local and remote Git repositories
  7. How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?
  8. What does FETCH_HEAD in Git mean?
  9. Difference between git pull and git pull –rebase
  10. Password authentication is temporarily disabled as part of a brownout. Please use a personal access token instead [duplicate]
  11. Message “Support for password authentication was removed. Please use a personal access token instead.”
  12. git stash and apply
  13. Why does git say “Pull is not possible because you have unmerged files”?
  14. Update Git submodule to latest commit on origin
  15. In what cases could `git pull` be harmful?
  16. There is no tracking information for the current branch
  17. ‘git pull origin mybranch’ leaves local mybranch N commits ahead of origin. Why?
  18. Git push only for bare repositories?
  19. How can I fetch an unmerged pull request for a branch I don’t own?
  20. How can I make my local repository available for git-pull?
  21. Why is git prompting me for a post-pull merge commit message?
  22. What is the difference between git pull and git fetch + git rebase?
  23. GitHub – fatal: could not read Username for ‘https://github.com’: No such file or directory
  24. Is it possible to pull just one file in Git?
  25. GIT pull error – remote object is corrupted
  26. Merge, update, and pull Git branches without using checkouts
  27. How to `git pull` while ignoring local changes?
  28. Restore git files deleted after git merge –abort
  29. How to pull remote branch from somebody else’s repo
  30. How can you disable Git integration in Visual Studio 2013 permanently?

Leave a Comment