Git pull after forced update

Question

I just squashed some commits with git rebase and did a git push --force  which is evil  I know    Now the other software engineers have a different history and when they do a git pull  Git will merge  Is there a way to fix this  except doing a rm my-repo  git clone git example org my-repo git   I need something like the opposite of git push --force  but git pull --force did not give the intended results

User · Answer

Pull with rebase  A regular pull is fetch   merge  but what you want is fetch   rebase   This is an option with the pull command   git pull --rebase

User · Answer

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 master --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  lt 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 master   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

User · Answer

This won t fix branches that already have the code you don t want in them  see below for how to do that   but if they had pulled some-branch and now want it to be clean  and not  ahead  of origin some-branch  then you simply   git checkout some-branch     where some-branch can be replaced by any other branch git branch base-branch -D    where base-branch is the one with the squashed commits git checkout -b base-branch origin base-branch    recreating branch with correct commits   Note  You can combine these all by putting  amp  amp  between them  Note2  Florian mentioned this in a comment  but who reads comments when looking for answers   Note3  If you have contaminated branches  you can create new ones based off the new  dumb branch  and just cherry-pick commits over   Ex   git checkout feature-old    some branch with the extra commits git log                     gives commits  write down the id of the ones you want  git checkout base-branch    after you have already cleaned your local copy of it as above git checkout -b feature-new   make a new branch for your feature git cherry-pick asdfasd     where asdfasd is one of the commit ids you want   repeat previous step for each commit id git branch feature-old -D   delete the old branch   Now feature-new is your branch without the extra  possibly bad  commits

[git] Git pull after forced update

Pull with rebase

Examples related to git

Examples related to git-pull