I have to make a change in one file, call it Annoying.cpp, to get a
library to work on my system. I then want to make other changes in
other files, and produce a patch. I made several commits, just never
'git adding' Annoying.cpp. Now I want to squash the last several
commits. When I do a 'git rebase' it yells that I haven't committed
all of my changes. I don't want to commit them though so that they are
not part of the patch. What can I do?
I could 'git checkout Annoying.cpp' to do the rebase, but then I'll
have to make the change again after the rebase. Is this the only
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to email@example.com.
To unsubscribe from this group, send email to
For more options, visit this group at