Ask Bjørn Hansen wrote: > > > On Feb 10, 2009, at 2:43, Robert Spier wrote: > > > Committed as > > > > http://github.com/rspier/qpsmtpd/commit/a0ae0453264fe8dd85c132f2e7305b5ac34bf7e8 > > > > Did you actually test that this worked? I had to tweak the code to > > make it make sense. Also, you had a mix of tabs and spaces and didn't > > follow the style of the rest of the code. I cleaned them up this > > time. > > Ah; git is great. :-) Basically this is like passing a patch around, > but with tools that are made to work with it. (We could also have had > three commits with two of them just having for the history books > useless tweaks).
Kind of. I used git am and then git commit --amend a few times, which didn't feel like the cleanest way to do it. I'd much rather git am apply the patch and set the appropriate metadata, but it not be committed until I actually want it to (so I can tweak it.) > I cherry-picked it, did a few more tweaks to the documentation and > committed to my master. Now because you have a commit I didn't pick > up, the easiest way to keep your git history clean is to do a "git > rebase abh/master" (or whatever you called my remote). Each time we do this, I think it's a pain. (I also think you should just accept that patch.) > > git remote add abh git://github.com/abh/qpsmtpd.git > git remote update > git rebase abh/master > > Since I made changes to the README file that will likely conflict with > yours, git will report a conflict. Since it was basically the same > change, you can just do > > git rebase --skip > > to toss your change away. You'll be left with a new history with this > new commit as HEAD~1 and the random error plugin as your last change. About here is where I ended up making my local WC very unhappy. Probably removing the .dotest directory wasn't the best idea(tm), but I'm pretty sure the instructions told me to do that. > (The way to avoid having to do the rebase to keep the history clean is > to put ~everything on topic branches). That seems like a bunch of extra work. I'm sending you http://github.com/rspier/qpsmtpd/commit/b3c10c6220ae356e0609e3f07929cd5cb3f77bb3, to get some of this written down. -R
