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. -- Chris -- Chris Knadle [email protected] _______________________________________________ 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!
