yet another workflow question...

Sorry for cluttering up the list with yet another very basic workflow question, but I'm still struggling with finding an answer to the burning question, "What can git do for me?" (So far, I have come to the conclusion that, for my simple, single developer, branchless, linear projects, there's not much that git can do for me that any other SCM could do for me. It appears to have been designed to solve problems for which I have absolutely no appreciation whatsoever. :-))

Anyway, on to basic newbie quesion #107...

I've been working on my project and I realize that I have 3-4 files modified with two orthogonal sets of changes. (I didn't realize this until I said to myself -- "Self, I should really check in these files before I go too much further down this path".) So I start "git diff"-ing the files and I find that most files have differences related to only one change or the other, but one file has differences related to both changes.

What do others do in this situation? a) Not allow themselves to get into this situation in the first place by careful planning?

b) Copy the file to "file.bothchanges", edit out one set of changes, commit that with one log message, edit back in the other set of changes, edit in the other set of changes, commit that with another log message?

c) Use some sort of automation to do option (b) for them?

d) Something else?

--wpd