git: squash my commit?

Question

Suppose you have:

A-B-C

Now your compilation/test fail. The fix should be merged in A. My current work-flow is like that:

$ git commit -m "fixA"

A-B-C-fixA

$ git rebase -i A~1

And squash fixA in A, result in:

A'-B-C

Question!

Is there a command to do something like

A-B-C + (index with fix for A)

$ git commit -supperdupper A

Result:

A'-B-C

Answer 1

What you are doing is dangerous if you are sharing the branch on which you are making changes with other people. In your case, you are rewriting commit A and rebasing B and C on top of the new A, which is a completely new object. Anyone who had already pulled the old A into their repositories could end up corrupting their repository as the history in your repository will have "magically" changed. Their git would have no way of knowing that the history has been rewritten.

Because of this fact, the Git developers have intentionally not made this easy to do as you must be aware of the consequences of doing such an operation.

Answer 2

There is no such command. You can only easily amend the most recent commit; if you want to amend a different one, you need to use git rebase, as you are already doing.