On Tue, 2010-07-06 at 14:50 -0400, Mike Kaplinskiy wrote: > On Tue, Jul 6, 2010 at 2:31 PM, Misha Koshelev <misha...@gmail.com> wrote: > > On Tue, Jul 6, 2010 at 12:42 PM, Misha Koshelev <misha...@gmail.com> wrote: > >> Thank you so much for the info. I will probably just keep the Zip file for > >> now but if the number of patches gets out of hand will try git again :-) > >> Thanks again > >> > >> Misha > >> > >> On Jul 6, 2010 12:18 PM, "Mike Kaplinskiy" <mike.kaplins...@gmail.com> > >> wrote: > >> > >> On Tue, Jul 6, 2010 at 11:27 AM, Misha Koshelev <misha...@gmail.com> wrote: > >>> Fyi I am just going to... > >> > >> It shouldn't be too hard. Something like the below might work. > >> > >> git rebase -i upstream/master # delete anything you like. Or put edit > >> instead of pick to edit it > >> git push -f origin master # forces a push even though your tree is not > >> at the HEAD of origin > >> > >> This breaks git history and can make people forking/pulling your tree > >> angry but assuming you don't care about them, all is well :). > >> > >> Mike. > >> > > > > On second thought, your method works quite well. Maybe I will keep a > > github repo - I still need one bit of advice though before I ditch my > > scripts... > > > > is there a good way to get rid of trailing whitespace, ideally when > > making a git commit -a -n ? > > > > It seems like an annoying problem that should be easily solvable... > > > > Thank you > > Misha > > > > There's a bunch of ways to fix whitespace. They all involve putting > --whitespace=fix or something like that in the command line. The only > one I've ever used is > > git rebase --whitespace=fix upstream/master > > It fixes whitespace on all the commits that you've made. I think it's > pretty good about merge conflicts due to whitespace as well. I don't > know of a way of doing this at commit time though. > > On another git note, if you do git pull/(git fetch; git merge) to > merge with upstream it might look nasty (merge commits). I think (git > fetch; git rebase) might work better. Someone should correct me if I'm > wrong, I'm no git wizard. > > Mike.
Wow thanks that's pretty neat. I'll have to test upstream merging later. Github seems not to have pulled in the latest Wine commits yet. :( I'm reading here: http://help.github.com/forking/ and they recommend: $ git fetch upstream $ git merge upstream/master I will try this. Thanks. Misha