Re: git rebase orthodontics

From: Boyd Stephen Smith Jr. <bss@iguanasuicide.net>
Date: Jan 7, 2009, 16:10 UTC
Message-ID: <200901071010.43926.bss@iguanasuicide.net>
In-Reply-To: <87sknvxje8.fsf@jidanni.org>

If you want to go from:

>               A jidanni
>              /
> D---E---F---G master

To:

> D---E---F---G---A master, jidanni

You don't want rebase. You want 'git checkout master && git merge jidanni'. I think you can throw --no-commit on the merge is you want to avoid a non-ff update to the master ref.

-- 
Boyd Stephen Smith Jr.                     ,= ,-_-. =. 
bss@iguanasuicide.net                     ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy           `-'(. .)`-' 
http://iguanasuicide.net/                      \_/