That's what the force option for a rebasing fetch is for, to accept overwriting the history on the machine. [For example, on Matthew's gr2 branch, he would regularly do this.]
Jay 2011/1/7 Robby Findler <ro...@eecs.northwestern.edu>: > Can I do that once I've pushed to robby/plt? What happens to other > machines that have unsquashed versions of those commits? > > Robby > > On Fri, Jan 7, 2011 at 9:43 AM, Jay McCarthy <jay.mccar...@gmail.com> wrote: >> I like to do an interactive rebase and squash commits together: >> >> git rebase -i HEAD^^10 >> >> where 10 is how many commits ahead of the master I am >> >> Jay >> >> 2011/1/7 Robby Findler <ro...@eecs.northwestern.edu>: >>> Another question: what if I commit something just for the purpose of >>> moving to another machine and I don't want that commit to show up in >>> the main repository? Is that possible? (My tree is currently in that >>> state; it is one commit ahead of plt/master but that commit message is >>> a lie-- I've just started to do that job; ordinarily I'd do git commit >>> --amend to add more stuff to it, but now I'm worried about that.) >>> >>> Robby >>> _________________________________________________ >>> For list-related administrative tasks: >>> http://lists.racket-lang.org/listinfo/dev >>> >> >> >> >> -- >> Jay McCarthy <j...@cs.byu.edu> >> Assistant Professor / Brigham Young University >> http://faculty.cs.byu.edu/~jay >> >> "The glory of God is Intelligence" - D&C 93 >> > -- Jay McCarthy <j...@cs.byu.edu> Assistant Professor / Brigham Young University http://faculty.cs.byu.edu/~jay "The glory of God is Intelligence" - D&C 93 _________________________________________________ For list-related administrative tasks: http://lists.racket-lang.org/listinfo/dev
