On Tuesday, December 17, 2013 3:09:18 PM UTC, John Cremona wrote: > > > git reset --hard HEAD~ > > This made me very nervous and I read some man pages before doing it, > but then did it anyway. After doing it, git diff ^master no longer > showed just the changes from the ticket but a vast amount of other > stuff. I am not sure this is where I want to be. >
That just undid the merge, so you are back on the ticket where the diff contains a lot of stuff that was added to master that is not yet in the ticket. The last step is optional, if you just want to review the ticket then you can just discard the merged branch when you are finished. If you want to make changes to the ticket and upload them then you should not commit the merge to the ticket, as it will make the ticket history confusing to read. However, if it makes it easier for you to keep the merge (e.g. because it pulls in dev scripts that you depend on) then it is not strictly forbidden either. -- You received this message because you are subscribed to the Google Groups "sage-git" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
