Added record-only rebase option

Added an option to the rebase builder for "record-only" merge.  This
will allow a one-way merge to take place.