> > Alternatively, you could use git merge --squash > > git checkout master > git merge --squash topic > > See git-merge(1) for details. > > rebase --interactive it excellent for cleaning up history, especially > if you want to end up with more than one commit at the end. merge > --squash is usually sufficient if all you need is one commit at the > end. > Brilliant, thanks everybody!! I'll go and back up my database and have a play with these options. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html