I think what I get from you and Jay is that it is possible to do, but I guess I'm not completely clear on one particular usecase how it would play out. (I understand that history rewriting is not allowed on plt/master and that makes a lot of sense, etc.)
Lets say that, on my laptop I make 7 commits. Then I push this to robby/plt and pull that down on my desktop. Now I squash those 7 commits into 3 and then I make another commit (perhaps in the middle somewhere via an interactive rebase). Now I push that. Now I go back to my laptop and everything will be all messed up. Even worse, I forget if I forgot to push some changes from laptop or not. What should I do to deal with this kind of situation? Robby On Fri, Jan 7, 2011 at 9:50 AM, Sam Tobin-Hochstadt <sa...@ccs.neu.edu> wrote: > On Fri, Jan 7, 2011 at 10:42 AM, Robby Findler > <ro...@eecs.northwestern.edu> wrote: >> 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.) > > If you commit something to your own private repository, you can then > rebase relative to plt/master, and then the bogus commit won't show up > (or rather, whatever the result of the rebase is will show up, which > can differ arbitrarily). > > Once you commit to the main repository, though, history-rewriting is > disallowed. > > Does that answer your question? > -- > sam th > sa...@ccs.neu.edu > _________________________________________________ For list-related administrative tasks: http://lists.racket-lang.org/listinfo/dev
