如何在git中重写历史记录？

Question

I cloned a project repository and did some commits to it. The commits were pretty dirty; I messed up tabs-spaces and committed some trash along the way. So before making a pull request I want to make things tidy. I think the best way would be making a new branch at origin/master and then apply commits from my old branch one by one to a working copy and doing clean commits to a new branch.

So how to apply commit from other branch to a working copy? Is it the best way to do it? Such task seems pretty common and maybe there is already an established workflow and tools for such things?

Answer 1

Let's say the work tree is something like:

and you want to apply only gh to the origin/master . First off, create a new branch using origin/master , and another for commits upto h only:

git checkout -b new-branch origin/master
git checkout -b daughter-branch h

Now, apply commits from g onwards

git rebase --onto new-branch g^