Skip to content
Snippets Groups Projects
  • Pierre-Yves David's avatar
    50f434510da6
    rebase: do not add second parent to rebased changeset (drop detach option) (BC) · 50f434510da6
    Pierre-Yves David authored
    Rebase now behaves as if --detach was always passed. Non-merges are
    rebased as non-merges, regardless of their parent being an ancestor of
    the destination. Merges will usually be rebased as merges unless both of
    their parents are ancestors of the destination, or one of their parents
    is pruned when rebased.
    
    This only alters the behavior of rebase when using the --source/--rev
    options. --detach option is deprecated.
    
    All test changes were carefully validated.
    50f434510da6
    History
    rebase: do not add second parent to rebased changeset (drop detach option) (BC)
    Pierre-Yves David authored
    Rebase now behaves as if --detach was always passed. Non-merges are
    rebased as non-merges, regardless of their parent being an ancestor of
    the destination. Merges will usually be rebased as merges unless both of
    their parents are ancestors of the destination, or one of their parents
    is pruned when rebased.
    
    This only alters the behavior of rebase when using the --source/--rev
    options. --detach option is deprecated.
    
    All test changes were carefully validated.