Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Sep 30, 2008
  1. @ageric @spearce

    rebase: Support preserving merges in non-interactive mode

    ageric authored spearce committed
    As a result of implementation details, 'git rebase' could
    previously only preserve merges in interactive mode. That
    limitation was hard for users to understand and awkward to
    explain.
    
    This patch works around it by running the interactive rebase
    helper git-rebase--interactive with GIT_EDITOR set to ':'
    when the user passes "-p" but not "-i" to the rebase command.
    The effect is that the interactive rebase helper is used but
    the user never sees an editor.
    
    The test-case included in this patch was originally written
    by Stephen Habermann <stephen@exigencecorp.com>, but has
    been extensively modified since its creation.
    
    Signed-off-by: Andreas Ericsson <ae@op5.se>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Something went wrong with that request. Please try again.