Git，为所有分支编辑根提交

Question

I have to rewrite the history of my repository because it contains some credentials. As I have to amend the root commit I followed the instructions from Git Faq :

git rebase -i allows you to conveniently edit any previous commits, except for the root commit. The following commands show you how to do this manually.

 # tag the old root git tag root `git rev-list HEAD | tail -1` git checkout -b new-root root # edit... git commit --amend # check out the previous branch git checkout @{-1} # replace old root with amended version git rebase --onto new-root root # cleanup git branch -d new-root git tag -d root 

My problem is though that I have two branches and several tags already in the repository and I'd like that my history rewrite to apply to those too. The repo isn't public yet, so that wouldn't be a problem. I've asked a similar question before, but in that case the git rebase command was not used. Here's a basic graph of my repo:

+  master branch
|
|   + topic branch
|   |
|   |
+---+
|
|
|
+  TAG
|
+  Initial commit, the commit I'd like to amend for all branches

Is it even possible?

Answer 1

Use " git filter-branch " instead of git-rebase.

If you really, really feel that rebase would be better, with modern git you can use --root option to git-rebase. Or cherry-pick root commit, and then rebase on top of it, if you have older git that doesn't have this option.