I'm starting to use Git (after a couple of years of CVS, then SVN). One thing I can't figure out:

I'm obsessive (lokal) commiter, eg. during a 60-minute session on a train I commited seven times. I don't want to push my changes upstream in that granularity though. Instead, I would like to push all changes from a particular lokal branch since my last push from that branch as a single diff.

I fiddled around with rebase, but couldn't figure out a way to make it compliant. I want to avoid anything that would leave Git, ie. diff/patch.

Any pointers?

You have to merge the commits. And yes, git rebase is the way to do it.

http://gitready.com/advanced/2009/02...th-rebase.html

Thanks for the link, I have another look.

Although, also an "obsessive committer," I usually don't do that. All of the work is done in a single branch, so "that's the container for the entire set of changes." After having a few messy problems with rebase, I just stopped doing it.

But I also, these days, probably commit a little less than I used to. Instead, I rigged up a desktop icon (and an Eclipse shortcut) that does an "rsync" to another directory on my hard drive. I hit that button very frequently. (Plus, Time Machine is going off on my Mac every hour, and sometimes I trigger backups more often.) This is my first line of defense against