Hi Paul, > > it is more appropriate to merge patches together and remove reverted > > patches from the history and the ChangeLog. > > Here's a combined patch that should do that. It reflects my most > recent proposal of leaving the dependencies alone.
Thanks a lot for taking the extra minutes to do that. > I have looked through the Stanford tutorial you mentioned and picked up some > tips. Many of these tutorials suggest to use branches extensively. Personally I minimize the use of branches and work almost exclusively with "git stash", "git commit --amend", and "git rebase -i". I'm sure Ralf does the opposite and uses branches a lot. Anyway, what matters is that proposed and committed patches are easy to review and easy to understand. > I took the liberty > of using "diff -w" to generate it, as that makes the diff easier to read. Very fine. I'll reply to it in another mail. Bruno -- In memoriam Paul Schneider <http://en.wikipedia.org/wiki/Paul_Schneider_(pastor)>