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@xxxxxxxxxxxxxxxxx ((_/)o o(\_)) ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-' http://iguanasuicide.net/ \_/
Attachment:
signature.asc
Description: This is a digitally signed message part.
