Sounds good to me. I went ahead and updated the working conventions page (after fiddling for a while with the amazingly annoying Trac wiki syntax):
http://ghc.haskell.org/trac/ghc/wiki/WorkingConventions/Git#Workingwiththetree I added 5 notes here that I think everyone will like, if they're not aware of them: - Darcs-style cherry-picking - Darcs-style interactive diff selection - Squashing a branch - Basic rebases. - Using the reflog. Finally I have a small advanced section concerning itself with an interactive rebase, but there is no example. I should perhaps fix that. On Thu, Sep 12, 2013 at 5:49 PM, Simon Peyton-Jones <[email protected]> wrote: > | also helps keep the history clean. An easy way to do this is: > | > | $ git checkout master > | $ git merge --squash type-nats-simple > | > | Then the changes will be on your branch, uncommitted, and a simple > | 'git commit ...' should let you make a big commit and write up some > | explanation. > > Woo. I'd never heard of that. Sounds really useful. > > Please Git experts, can you document some of these helpful workflows for us > ingnoramuses! A series of headings "To do X..." followed by a how-to like > the above, with a bit of explanation of when to use it and what is going on. > Would be v helpful! > > Simon -- Austin Seipp, Haskell Consultant Well-Typed LLP, http://www.well-typed.com/ _______________________________________________ ghc-devs mailing list [email protected] http://www.haskell.org/mailman/listinfo/ghc-devs
