On 17 December 2013 14:47, Volker Braun <[email protected]> wrote: > Correction: If you want to use plain git, you need to first merge with > master (otherwise you don't just get the diff of what was added in the > ticket, but also what was added to master since the ticket branch was > forked). > > git checkout my_ticket > git merge master > git diff ^master
OK so far -- I did those three and I am seeing the diffs I was expecting! > 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. John > > The dev script would do that for you except that #8723 was forked off before > the dev scripts were implemented. So once you checkout the ticket, you lose > the dev scripts. But for new tickets "sage -dev diff --base master" should > work. > > -- > 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.
