Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Jun 26, 2012

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

    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>
    authored June 26, 2012 gitster committed June 26, 2012

Feb 27, 2012

  1. Andrew Wong

    rebase -m: only call "notes copy" when rewritten exists and is non-empty

    This prevents a shell error complaining rebase-merge/rewritten doesn't exist.
    
    Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored February 24, 2012 gitster committed February 26, 2012

Feb 10, 2011

  1. rebase -m: don't print exit code 2 when merge fails

    When the merge strategy fails, a message suggesting the user to try
    another strategy is displayed. Remove the "$rv" (which is always equal
    to "2" in this case) from that message.
    
    Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored February 06, 2011 gitster committed February 10, 2011
  2. rebase: extract code for writing basic state

    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>
    authored February 06, 2011 gitster committed February 10, 2011
  3. rebase: extract merge code to new source file

    Extract the code for merge-based rebase to git-rebase--merge.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>
    authored February 06, 2011 gitster committed February 10, 2011
Something went wrong with that request. Please try again.