git revert of course. :-) http://www.kernel.org/pub/software/scm/git/docs/git-revert.html
dan On Mon, Jun 7, 2010 at 2:48 PM, Trans <transf...@gmail.com> wrote: > > On Jun 7, 5:31 pm, Jacob Helwig <jacob.hel...@gmail.com> wrote: > >> You're probably best off reverting the commit(s) that brought in the >> changes you don't want, before merging in your changes. Your merge >> will then be able to go forward as though the other changes had never >> happened. > > Ok thanks. So I should move my changes into a separate branch, pull > down his, then revert to where my branch diverged from his and then > merge my branch. Cool. Only one last question, what's command do you > use to reverting to a prior state? > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To post to this group, send email to git-us...@googlegroups.com. > To unsubscribe from this group, send email to > git-users+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/git-users?hl=en. > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
