git filter-repo rewrote all branch histories — branches now show 5500+ commits ahead/behind main

[NandhiniN0506]

🏷️ Discussion Type

Bug

💬 Feature/Topic Area

Issues

Body

Issue: Repository History Diverged After git filter-repo and Partial Force Push

What Happened

I accidentally committed a .npmrc file containing secrets and pushed it via a PR. To remove the secret from the repository history, I used git filter-repo to completely strip the file from all commits.

Commands Used

git filter-repo --path .npmrc --invert-paths
git push origin --force --all
git push origin --force --tags
What Went Wrong
git filter-repo rewrote the entire commit history, since each commit depends on its parent SHA.
I then force-pushed all branches to the remote.

However:

The main branch has branch protection enabled, so the force push to main was rejected.
As a result:
main retains the original commit history.
All other branches were rewritten with new commit SHAs.

This caused main and all other branches to diverge completely, with Git only recognizing the initial commit as a common ancestor.

Current Impact

All branches (except main) now show:

“This branch is ~5k+commits ahead and ~5k+ commits behind main.”

This is not actual work difference — it’s due to rewritten history.
Active PRs now show thousands of commits in the diff, making them unusable.
Important Notes
main and other importatn branches are intact and working correctly.
No actual code is lost:
Changes already merged into main are safe.
Other changes can be recovered from rewritten branches if needed.
What I Need Help With
What is the best way to recover from this situation?

### Guidelines

- [X] I have read the above statement and can confirm my post is relevant to the GitHub feature areas [Issues](https://docs.github.com/en/issues/tracking-your-work-with-issues/about-issues) and/or [Projects](https://docs.github.com/en/issues/planning-and-tracking-with-projects/learning-about-projects/about-projects).

[github-actions[bot]]

💬 Your Product Feedback Has Been Submitted 🎉

Thank you for taking the time to share your insights with us! Your feedback is invaluable as we build a better GitHub experience for all our users.

Here's what you can expect moving forward ⏩

• Your input will be carefully reviewed and cataloged by members of our product teams. 
  • Due to the high volume of submissions, we may not always be able to provide individual responses.
  • Rest assured, your feedback will help chart our course for product improvements.
• Other users may engage with your post, sharing their own perspectives or experiences. 
• GitHub staff may reach out for further clarification or insight. 
  • We may 'Answer' your discussion if there is a current solution, workaround, or roadmap/changelog post related to the feedback.

Where to look to see what's shipping 👀

• Read the Changelog for real-time updates on the latest GitHub features, enhancements, and calls for feedback.
• Explore our Product Roadmap, which details upcoming major releases and initiatives.

What you can do in the meantime 💻

• Upvote and comment on other user feedback Discussions that resonate with you.
• Add more information at any point! Useful details include: use cases, relevant labels, desired outcomes, and any accompanying screenshots.

As a member of the GitHub community, your participation is essential. While we can't promise that every suggestion will be implemented, we want to emphasize that your feedback is instrumental in guiding our decisions and priorities.

Thank you once again for your contribution to making GitHub even better! We're grateful for your ongoing support and collaboration in shaping the future of our platform. ⭐

[Sagargupta16]

This is expected behavior after git filter-repo - it rewrites commit hashes for every affected commit, which makes all branches appear diverged from each other since they no longer share common history.

What happened

When you ran git filter-repo --path .npmrc --invert-paths and force-pushed, it rewrote the entire history of all branches. But if any branches had already been merged into main before the rewrite, their old (pre-rewrite) merge commits still reference the old hashes. GitHub sees these as completely different histories, hence the 5500+ ahead/behind.

How to fix it

Option 1: Force-push all branches (if you have few collaborators)

Every collaborator needs to re-clone or hard reset:

# For each stale branch, reset to the rewritten version
git fetch origin
git checkout <branch-name>
git reset --hard origin/<branch-name>

If some branches were already merged into main, they can be safely deleted since their changes are already in the rewritten main.

Option 2: Delete stale branches

If those branches are already merged (their changes exist in main), just delete them:

# List merged branches
git branch -r --merged origin/main

# Delete them
git push origin --delete branch-name

Option 3: Rebase remaining active branches

For branches with ongoing work:

git checkout feature-branch
git rebase origin/main
git push --force-with-lease origin feature-branch

About the secret

Since the .npmrc with secrets was already pushed and visible in the PR, the secret is compromised regardless of the history rewrite. Make sure you've rotated the credentials - removing from git history prevents future exposure but doesn't invalidate what was already seen.