On Wed, Mar 3, 2010 at 11:35 AM, Victor Engmark <[email protected]> wrote: > Also, it seems that any attempt to rebase to master results in a > horrible mess of octopus commits, even though I only ever commit stuff > linearly. Is there some magic to tell Git try really hard to create a > linear sequence out of my commits? git rebase -i doesn't seem to work > (I usually get messages saying it *somehow* can't continue) unless I > try to squash everything into a single commit. And that's not what > version control is about :)
OK, looks like this is getting somewhere. Turns out that some of the commits have been duplicated (different hash but the exact same diff and commit message), who knows why. Using `git rebase -i <commit before my first commit>`, I just removed those commits, and the tree returned to a linear branch. I don't seem to be missing anything either, because installing both my main branches works fine. If you do this, make sure you've got backups, because you'll have to force push / pull to create a nice tree everywhere, and forced operations can destroy history. -- Victor Engmark
