On Sun, Apr 3, 2011 at 1:12 AM, Peter Stuge <pe...@stuge.se> wrote: > Øyvind Harboe wrote: >> Here is an idea on how to handle gaffe's near the tip of master >> branch: > > What's a gaffe?
A silly mistake. >> - 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. In some > cases it can make sense anyway, but I think better avoid for master. How and where does git assume this? A tag would make that branch publicly visible, so a user would find himself working on top of a tag instead of the master branch. He can then merge or rebase on top of master branch easily. -- Ø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