git-rewrite-history

The question may seem odd, but I have issues syncing git history after rewriting over 100 commits. On the machine I did rewrite from, a simple git fetch synced it all. On another mac machine, git sync did not help, but after a random deleting of local .git/ log and refs files and then issuing git pull , history got refreshed. However, no matter what I do on the Windows machine, I cannot refresh project history. Tried it all: git reset --hard HEAD & git fetch git fetch --all git pull etc Each time on Windows machines, I get duplicated entries (I changed Author fields) of the same commit with a

Suppose I have the following history: A---B---C----------D------------E master \ /\ / W1--X1--Y1 W2--X2--Y2 topic1 topic2 Is it possible to remove all topic branches and their commits as following A-B-C-D-E master You have a few options for doing this. Solution 1: Squash Merges One solution is to simply use a hard reset with a few squash merges: git checkout master git reset --hard C git merge --squash topic1 git commit -m "Rewrite D" git merge --squash topic2 git commit -m "Rewrite E" # Verify that the new branch is no different from the old one git diff sha_of_old_E The idea here is that a

Very basic git question: I uploaded some compromising information to Github and am using bfg to clean the repo. I followed the documentation and performed the following actions: $ git clone --mirror git://example.com/some-big-repo.git $ bfg --replace-text passwords.txt my-repo.git I received the following output: Found 233 objects to protect Found 9 commit-pointing refs : HEAD, refs/heads/experimental, refs/heads/master, ... Protected commits ----------------- These are your protected commits, and so their contents will NOT be altered: * commit 497fc1c8 (protected by 'HEAD') Cleaning --------

I have read this question about changing the timestamp of an old commit. What I'd like to know is: this kind of operations is destructive (i.e. don't leave any traces) or is it possible to find out that a certain operation was done on the repository? If is it so, how could I do it? Thanks VonC Unless you have acces to the repo where the operation (generally a git filter-branch ) has been done, and where you can access the git reflog , you wouldn't be able to audit this kind of change. Meaning that if you clone that repo, the clone has no trace of that "rewrite" operation. And even if you have

Hello I have successfully rewrote history and got the 5 folders I wanted to extract using git filter-branch -f --prune-empty --tree-filter 'rm -rf <all unwanted dirs>' and kept all git history. The only remaining issue are submodules, I sill have commits doing Subproject commit <hash> and I want to completely remove ALL of those submodule commits from my git history, how can I accomplish this? I have done it with git filter-branch -f --prune-empty --tree-filter ' git submodule deinit -f . git rm -rf lib && rm -rf lib find . -name .gitmodules -delete' HEAD Assuming that all of my submodules