Skip to content

rebase --root

Thomas Rast git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 of 3 patches 9 repliesIn review

2 of 3 patches are in this archive. The cover letter announces 3.

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
2/3diff: refactor the word-diff setup from builtin_diff_cmddiff.c+63 -561 reply
3/3diff: tweak a _copy_ of diff_options with word-diffdiff.c t/t4034-diff-words.sh+5 -21 reply

Reviews trailers per patch

None of the 2 patches has a Reviewed-by or Acked-by.

PatchJohannes Sixt
2/3
3/3Noticed-by

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 0/3] rebase --root

Inspired by f95ebf7 (Allow cherry-picking root commits, 2008-07-04), this teaches git rebase to rebase everything up to the root commit(s).

The main use-case for this is if you hack on new history, then later notice that you want to unroll the commits "on" a git-svn branch to dcommit them separately. (If you just want to squash them, a merge will do fine.)

Note that --root (in both modes) requires --onto; you cannot rebase "onto nothing" to edit the root commit. Such an option --onto-nothing might be a worthwile feature however, since it would also allow "detaching" a set of commits from their parent history.

BTW, while hacking this I noticed that there are two different tests t3409:

t3409-rebase-hook.sh
t3409-rebase-preserve-merges.sh

Is this okay, or should one of them be renamed?

Thomas Rast (3):
rebase: learn to rebase root commit
rebase -i: learn to rebase root commit
rebase: update documentation for --root

 Documentation/git-rebase.txt |   17 +++++++---
 git-rebase--interactive.sh   |   53 +++++++++++++++++++++++++--------
 git-rebase.sh                |   51 ++++++++++++++++++++++----------
 t/t3412-rebase-root.sh       |   66 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 153 insertions(+), 34 deletions(-)
 create mode 100755 t/t3412-rebase-root.sh