Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jun 26, 2012
  1. @gitster

    rebase: don't source git-sh-setup twice

    Martin von Zweigbergk authored gitster committed
    The git-sh-setup script is already sourced in git-rebase.sh before
    calling into git-rebase--(am|interactive|merge).sh. There are no other
    callers of these scripts. It is therefore unnecessary to source
    git-sh-setup again in them.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 24, 2012
  1. @gitster

    git-rebase: add keep_empty flag

    Neil Horman authored gitster committed
    Add a command line switch to git-rebase to allow a user the ability to specify
    that they want to keep any commits in a series that are empty.
    
    When git-rebase's type is am, then this option will automatically keep any
    commit that has a tree object identical to its parent.
    
    This patch changes the default behavior of interactive rebases as well.  With
    this patch, git-rebase -i will produce a revision set passed to
    git-revision-editor, in which empty commits are commented out.  Empty commits
    may be kept manually by uncommenting them.  If the new --keep-empty option is
    used in an interactive rebase the empty commits will automatically all be
    uncommented in the editor.
    
    Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 10, 2011
  1. @gitster

    git-rebase--am: remove unnecessary --3way option

    Martin von Zweigbergk authored gitster committed
    Since 22db240 (git-am: propagate --3way options as well, 2008-12-04),
    the --3way has been propageted across failure, so it is since
    pointless to pass it to git-am when resuming.
    
    Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    rebase: extract code for writing basic state

    Martin von Zweigbergk authored gitster committed
    Extract the code for writing the state to rebase-apply/ or
    rebase-merge/ when a rebase is initiated. This will make it easier to
    later make both interactive and non-interactive rebase remember the
    options used.
    
    Note that non-interactive rebase stores the sha1 of the original head
    in a file called orig-head, while interactive rebase stores it in a
    file called head. Change this by writing to orig-head in both
    cases. When reading, try to read from orig-head. If that fails, read
    from head instead. This protects users who upgraded git while they had
    an ongoing interactive rebase, while still making it possible to
    remove the code that reads from head at some point in the future.
    
    Helped-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    rebase: extract am code to new source file

    Martin von Zweigbergk authored gitster committed
    Extract the code for am-based rebase to git-rebase--am.sh.
    
    Suggested-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.