How to permanently remove few commits from remote branch

Question

I know that s rewriting of history which is bad yada yada   But how to permanently remove few commits from remote branch

User · Answer

git reset --soft commit id  git stash save  message   git reset --hard commit id  git stash apply stash stash  0   git push --force

User · Answer

Simplifying from pctroll s answer  similarly based on this blog post     look up the commit id in git log or on github  e g  42480f3  then do git checkout master git checkout your branch git revert 42480f3   a text editor will open  close it with ctrl x  editor dependent  git push origin your branch   or replace origin with your remote

User · Answer

Important  Make sure you specify which branches on  git push   -f  or you might inadvertently modify other branches      There are three options shown in this tutorial  In case the link breaks I ll leave the main steps here    Revert the full commit Delete the last commit Delete commit from a list   1 Revert the full commit  git revert dd61ab23   2 Delete the last commit  git push  lt  lt remote gt  gt   dd61ab23   lt  lt BRANCH NAME HERE gt  gt    or  if the branch is available locally  git reset HEAD  --hard git push  lt  lt remote gt  gt  -f   where  dd61    is your commit hash and git interprets x  as the parent of x  and   as a forced non-fastforwared push   3 Delete the commit from  a list  git rebase -i dd61ab23    This will open and editor showing a list of all commits  Delete the one you want to get rid off  Finish the rebase and push force to repo   git rebase --continue git push  lt remote repo gt   lt remote branch gt  -f

User · Answer

If you want to delete for example the last 3 commits  run the following command to remove the changes from the file system  working tree  and commit history  index  on your local branch   git reset --hard HEAD 3   Then run the following command  on your local machine  to force the remote branch to rewrite its history   git push --force   Congratulations  All DONE   Some notes   You can retrieve the desired commit id by running   git log   Then you can replace HEAD N with  lt desired-commit-id gt  like this   git reset --hard  lt desired-commit-id gt    If you want to keep changes on file system and just modify index  commit history   use --soft flag like git reset --soft HEAD 3  Then you have chance to check your latest changes and keep or drop all or parts of them  In the latter case runnig git status shows the files changed since  lt desired-commit-id gt   If you use --hard option  git status will tell you that your local branch is exactly the same as the remote one  If you don t use --hard nor --soft  the default mode is used that is --mixed  In this mode  git help reset says      Resets the index but not the working tree  i e   the changed files are   preserved but not marked for commit  and reports what has not been   updated

User · Answer

Just note to use the last working commit id  when reverting a non-working commit  git reset --hard  lt last working commit id gt    So we must not reset  to the commit id that we don t want   Then sure  we must push to remote branch   git push --force

User · Answer

You git reset --hard your local branch to remove changes from working tree and index  and you git push --force your revised local branch to the remote   other solution here  involving deleting the remote branch  and re-pushing it   This SO answer illustrates the danger of such a command  especially if people depends on the remote history for their own local repos  You need to be prepared to point out people to the RECOVERING FROM UPSTREAM REBASE section of the git rebase man page    With Git 2 23  August 2019  nine years later   you would use the new command git switch  That is  git switch -C mybranch origin mybranch n  replace n by the number of commits to remove   That will restore the index and working tree  like a git reset --hard would  The documentation adds    -C  lt new-branch gt  --force-create  lt new-branch gt        Similar to --create except that if  lt new-branch gt  already exists  it will be reset to  lt start-point gt     This is a convenient shortcut for     git branch -f  lt new-branch gt    git switch  lt new-branch gt

User · Answer

Sometimes the easiest way to fix this issue is to make a new branch from the place where you know the code is good   Then you can leave the errant branch history alone in case you need to cherry-pick other commits from it later   This also ensures you did not lose any commit history   From your local errant branch   git log   copy the commit hash that you wanted the branch to be at and exit the git log  git checkout theHashYouJustCopied git checkout -b your new awesome branch   Now you have a new branch just the way you want it   If you also needed to keep a specific commit from the errant branch that is not on your new branch  you can just cherry-pick that specific commit you need   git checkout the errant branch git log   Copy the commit hash of the one commit you need to pull into the good branch and exit the git log   git checkout your new awesome branch git cherry-pick theHashYouJustCopied   Pat yourself on the back

User · Answer

This might be too little too late but what helped me is the cool sounding  nuclear  option   Basically using the command filter-branch you can remove files or change something over a large number of files throughout your entire git history   It is best explained here

[git] How to permanently remove few commits from remote branch

Examples related to git