| commit | d481bcc93f393bbfaaef31acfcfc2d48097b4faf | |
| author | Jörg Sommer <joerg@alea.gnuu.de> | |
| Mon, 14 Apr 2008 00:21:06 +0000 (14 02:21 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Apr 2008 05:31:07 +0000 (21 22:31 -0700) | ||
| tree | 47f24c5b7b2f2456fa9a9dbb9955b3c2c213c0ef | treesnapshot (tar.gz zip) |
| parent | abe32eafcd8302c387ed8e3760b46aa9d78cc134 | commitdiff |
Do rebase with preserve merges with advanced TODO list
The current algorithmus used to rebase a branch with merges on top of
another has some drawbacks: it's not possible to squash commits, it's not
possible to change the order of commits, particularly the tip of the
branch can't change.
This new algorithmus uses the idea from Junio to create a TODO list with
the commands mark, merge and reset to represent the nonlinear structure
of merges.
Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The current algorithmus used to rebase a branch with merges on top of
another has some drawbacks: it's not possible to squash commits, it's not
possible to change the order of commits, particularly the tip of the
branch can't change.
This new algorithmus uses the idea from Junio to create a TODO list with
the commands mark, merge and reset to represent the nonlinear structure
of merges.
Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory | |
| t/t3404-rebase-interactive.sh | diffblobblamehistory |