On 17 December 2013 15:20, Volker Braun <[email protected]> wrote: > 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.
I see: so were proposing that if I wanted to see just the changes made by the ticket, I should merge, look at the changes, and then unmerge (in effect). > > 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. Of course. But if I did want to make some "reviewer changes" then I should continue with the unmerged branch, correct? > > 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. OK. I guess an alternative would be to use git rebase to rebase the ticket branch onto the current master branch; then upload that to the ticket, whcih would make it easier for others to look at it (until master changes again, of course). But pehaps it should be the ticket author, rather than the reviewer, who does any rebasing. John > > -- > 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. -- 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.
