[bpicolo]

Then do a commit and then use rebase interactive (-i) and squash them together.

[artursapek]

That's what I would do, and that's what "git inject" seems to be after.