On Sun, Apr 3, 2011 at 8:56 PM, Peter Stuge <pe...@stuge.se> wrote: > Øyvind Harboe wrote: >> >> - correct master branch and force a push to the master branch >> > >> > Better avoid rebasing master. Not that it's forbidden, but git and >> > others assume there will be no publically visible rebases. >> >> How and where does git assume this? > > push, merge and rebase (locally) will complain if a remote repo has > been rebased. It's simple enough to override the complaint with -f to > each respective git command, and if someone has local changes on top > of what used to be master they will then need to rebase their work > onto what is now master.
I haven't tried merge, but I have never seen rebase complain about rebasing when the server branch has been rewritten. I'm thinking fixing gaffe's as far back as a week is OK. -- Øyvind Harboe Can Zylin Consulting help on your project? US toll free 1-866-980-3434 / International +47 51 87 40 27 http://www.zylin.com/zy1000.html ARM7 ARM9 ARM11 XScale Cortex JTAG debugger and flash programmer _______________________________________________ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
