Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Sep 9, 2013
  1. @moy @gitster

    rebase: fix run_specific_rebase's use of "return" on FreeBSD

    moy authored gitster committed
    Since a1549e1, git-rebase--am.sh uses the shell's "return" statement, to
    mean "return from the current file inclusion", which is POSIXly correct,
    but badly interpreted on FreeBSD, which returns from the current
    function, hence skips the finish_rebase statement that follows the file
    inclusion.
    
    Make the use of "return" portable by using the file inclusion as the last
    statement of a function.
    
    Reported-by: Christoph Mallon <christoph.mallon@gmx.de>
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 6, 2009
  1. @moy @gitster

    rebase: consistent error messages for staged and unstaged changes.

    moy authored gitster committed
    Previous version expose the output of the plumbing update-index to the
    user, which novice users have difficulty to understand.
    
    We still need to run update-index to refresh the cache (if
    diff.autorefreshindex is false, git diff won't do it).
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.