| commit | 18640d991bde7e081fb851cea5114c09472b188f | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Sun, 8 Jul 2007 02:01:29 +0000 (8 03:01 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Jul 2007 01:24:19 +0000 (8 18:24 -0700) | ||
| tree | 621b19e73777dd5b72e3cf16c56398ff6ac2c85b | treesnapshot (tar.gz zip) |
| parent | 797e99a27848a0f6da1f3c85cb3714652fde23ba | commitdiff |
rebase -i: handle --continue more like non-interactive rebase
Non-interactive rebase requires the working tree to be clean, but
applies what is in the index without requiring the user to do it
herself. Imitate that, but (since we are interactive, after all)
fire up an editor with the commit message.
It also fixes a subtle bug: a forgotten "continue" was removed, which
led to an infinite loop when continuing without remaining patches.
Both issues noticed by Frank Lichtenheld.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Non-interactive rebase requires the working tree to be clean, but
applies what is in the index without requiring the user to do it
herself. Imitate that, but (since we are interactive, after all)
fire up an editor with the commit message.
It also fixes a subtle bug: a forgotten "continue" was removed, which
led to an infinite loop when continuing without remaining patches.
Both issues noticed by Frank Lichtenheld.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory | |
| t/t3404-rebase-interactive.sh | diffblobblamehistory |