diff options
author | Thomas Rast <trast@student.ethz.ch> | 2009-01-05 18:35:16 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-11 23:03:36 -0800 |
commit | 190f53232d1e92a57843df90e889bcfea39620d3 (patch) | |
tree | 220a1ac3c0fdced275e983644ed3de935c240dfd /git-relink.perl | |
parent | d8fab0234d6db440a71f38f8538dbdefbbdfd077 (diff) | |
download | git-190f53232d1e92a57843df90e889bcfea39620d3.tar.gz git-190f53232d1e92a57843df90e889bcfea39620d3.tar.xz |
rebase: learn to rebase root commit
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>
Diffstat (limited to 'git-relink.perl')
0 files changed, 0 insertions, 0 deletions