Re: Issue 2100: Explanation of branches for CG (issue 5539062)

[Carl . D . Sorensen]

On 2012/01/16 07:54:41, Graham Percival wrote:
> On Sun, Jan 15, 2012 at 11:12:49PM +0000,
mailto:address@hidden wrote:
> > At this point, you have pushed dev/cg to staging without polluting
> > dev/cg with staging.  And you can continue to rebase dev/cg with
master
> > as needed/desired.  You never have to worry about accidentally
putting
> > some reverted commit back into staging.  It's completely foolproof.

Having just spent half an hour fixing up my lilygit.tcl branch, I have
personally validated the benefit of the approach now reflected in this
patch.

I will *never* again rebase a working branch to origin/staging.  In
fact, I will never again have a local branch staging.

Instead, I will only rebase my working branches to origin/master, and do
a detached head rebase to origin/staging for pushing purposes.  I assume
this will save me time periodically.  And although the time saved may
not be huge, the aggravation saved will  be.

Thanks for getting me to work on this, Graham.  The time has now been
all worth it.


http://codereview.appspot.com/5539062/