I agree with Volker: any plan which involves rewriting the history of your branch to make it "nicer" is a very bad idea. Once you push changes to trac, you really should not go back and rewrite your commits. Even if you decide you don't want some code that you introduced, you should introduce a new commit that deletes the code rather than removing old commits and force-pushing your branch.
This is a fundamental difference between using patches and using revision control properly. You just can't do this kind of thing without causing anyone else who's based work on your ticket a lot of pain. And you won't even know who they are: they may not have pushed their work to a trac ticket yet. TLDR; don't rewrite history. David On Mon, Nov 4, 2013 at 9:55 AM, Volker Braun <vbraun.n...@gmail.com> wrote: > git blame already does cumulative blame over a range of commits. By > mashing commits together you don't gain anything. But you invalidate all > branches that were based on the un-mashed commits. > > If you absolutely can't live with others noticing that you are human after > all, then you can still squash your history locally before pushing it to > trac. But IMHO thats just OCD and nothing that we should teach people to do > by default. > > TLDR; lots of pain for absolutely no gain. > > > > On Monday, November 4, 2013 6:15:19 AM UTC, Nils Bruin wrote: >> >> That's good to know. However, when trying to figure out the history of >> code, it's usually not so much the question what has changed, but more when >> and (more importantly) why. "git blame" does that, and hopefully the log >> entry for the relevant commit tells you where to look further. If that >> commit reads "third iteration of typo correction and rollback of latest >> change" it's not so helpful and you need to go and look in the log for >> commits close by that are more instructive. >> >> -- > You received this message because you are subscribed to the Google Groups > "sage-devel" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to sage-devel+unsubscr...@googlegroups.com. > To post to this group, send email to sage-devel@googlegroups.com. > Visit this group at http://groups.google.com/group/sage-devel. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/groups/opt_out.
