Remove spurious commit parent pointer

Question

I imported a Bazaar repository into Git (using git bzr), but the resulting repository contains a spurious commit parent link:

Answer 1

This will correct the parents without changing anything else (eg. committer dates):

git filter-branch --tag-name-filter cat --parent-filter 'test $GIT_COMMIT = [sha of 1.02-6] && echo "-p [sha of 1.02-3]" || cat' -- 1.02-1..master

You will have to replace the bracketed text with the appropriate commit IDs. If you have more downstream branches that need to be rewritten, change 1.02-1..master to --all and be prepared to wait.

Of course, don't use this or any other solution if others have branched from any commits after the ones you want to edit. They will hate you.