Sorry it looks like I missed some basic documentation:
http://git-scm.com/docs/git-rebase
This issue (combining preserve merges with interactive option) is
described in the BUGS section.
Is there a way I can go about this without losing my merge commits?
On Thu, Mar 20, 2014 at 2:37 PM, Robert D
I have a local-only branch with just under 70 commits. I also have
merge commits on this branch.
The log of the top few commits on my branch looks like so:
* de651ff (20 minutes ago) (HEAD, survey) Robert Dailey - WIP:
GOTO implementation
* 2a68a23 (21 minutes ago) Robert Dailey - Mov
2 matches
Mail list logo
