Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Mar 13, 2010
  1. @trast @gitster

    rebase: support automatic notes copying

    trast authored gitster committed
    Luckily, all the support already happens to be there.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @trast @gitster

    rebase: invoke post-rewrite hook

    trast authored gitster committed
    We have to deal with two separate code paths: a normal rebase, which
    actually goes through git-am; and rebase {-m|-s}.
    
    The only small issue with both is that they need to remember the
    original sha1 across a possible conflict resolution.  rebase -m
    already puts this information in $dotest/current, and we just
    introduce a similar file for git-am.
    
    Note that in git-am, the hook really only runs when coming from
    git-rebase: the code path that sets the $dotest/original-commit file
    is guarded by a test for $dotest/rebasing.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 12, 2009
  1. @trast @gitster

    rebase: learn to rebase root commit

    trast authored gitster committed
    Teach git-rebase a new option --root, which instructs it to rebase the
    entire history leading up to <branch>.  This option must be used with
    --onto <newbase>, and causes commits that already exist in <newbase>
    to be skipped.  (Normal operation skips commits that already exist in
    <upstream> instead.)
    
    One possible use-case is with git-svn: suppose you start hacking
    (perhaps offline) on a new project, but later notice you want to
    commit this work to SVN.  You will have to rebase the entire history,
    including the root commit, on a (possibly empty) commit coming from
    git-svn, to establish a history connection.  This previously had to
    be done by cherry-picking the root commit manually.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.