On 01/02/2010 08:39 PM, Chris Knadle wrote: > On Saturday 02 January 2010, Sean Dague wrote: >> I've got a pretty hefty slide deck for the Git presentation on >> Wednesday, with lots of diagrams to visualy explain what's going on >> around merges, one of the key areas that people get lost early on. >> >> As explanations make a lot more sense with diagrams, I'd be >> interested in any specific questions around git that folks had >> upfront, so I could make sure to have prepped helpful diagrams to >> explain. >> >> -Sean > > One of the places I was caught early on was how to do a "reset" on > stuff that was staged so that I didn't have to commit it. Also how to > roll back HEAD to a prior commit in order to either un-commit or un- > merge if either was done to the master branch. (The commit "--ammend" > flag is also useful here.) In essense -- how to go backwards, which > can be done but isn't as clear as how to go forward. > > I'm also not completely clear on when it's most reasonable to do a git > "rebase" and where it should be avoided.
I think I've got rebase covered, I'll find out the night of the talk. :)
I talk about some of the oh crap, go back! stuff, but I'll look at
doing flows for that as well.
-Sean
--
__________________________________________________________________
Sean Dague Mid-Hudson Valley
sean at dague dot net Linux Users Group
http://dague.net http://mhvlug.org
There is no silver bullet. Plus, werewolves make better neighbors
than zombies, and they tend to keep the vampire population down.
__________________________________________________________________
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Mid-Hudson Valley Linux Users Group http://mhvlug.org http://mhvlug.org/cgi-bin/mailman/listinfo/mhvlug Upcoming Meetings (6pm - 8pm) MHVLS Auditorium Jan 6 - Git Feb 3 - Arduino Mar 3 - Gnome 3 & 7 year bday!
