Return to 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 && between them.

Note 2: Florian mentioned this in a comment, but who reads comments when looking for answers?

Note 3: If you have contaminated branches, you can create new ones based off the new "dumb branch" and just cherry-pick commits over.

Example:

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!

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 && 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!

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 && between them.

Note 2: Florian mentioned this in a comment, but who reads comments when looking for answers?

Note 3: If you have contaminated branches, you can create new ones based off the new "dumb branch" and just cherry-pick commits over.

Example:

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!

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 && between them.

Note 2: Florian mentioned this in a comment, but who reads comments when looking for answers?

Note 3: If you have contaminated branches, you can create new ones based off the new "dumb branch" and just cherry-pick commits over.

Example:

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!

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 && 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!

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 && between them.

Note 2: Florian mentioned this in a comment, but who reads comments when looking for answers?

Note 3: If you have contaminated branches, you can create new ones based off the new "dumb branch" and just cherry-pick commits over.

Example:

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!