| commit | a6c7a27691bd8b059d39c9bc71b19fb8e614fa54 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 26 Jan 2009 09:05:22 +0000 (26 10:05 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Jan 2009 05:23:19 +0000 (26 21:23 -0800) | ||
| tree | c053419f4960e656f292569d0e6c754d7cc396b7 | treesnapshot (tar.gz zip) |
| parent | f7d9d04e3be697989c960881f9b0d50f1ea6a6be | commitdiff |
rebase -i: correctly remember --root flag across --continue
d911d14 (rebase -i: learn to rebase root commit, 2009-01-02) tried to
remember the --root flag across a merge conflict in a broken way.
Introduce a flag file $DOTEST/rebase-root to fix and clarify.
While at it, also make sure $UPSTREAM is always initialized to guard
against existing values in the environment.
[tr: added tests]
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
d911d14 (rebase -i: learn to rebase root commit, 2009-01-02) tried to
remember the --root flag across a merge conflict in a broken way.
Introduce a flag file $DOTEST/rebase-root to fix and clarify.
While at it, also make sure $UPSTREAM is always initialized to guard
against existing values in the environment.
[tr: added tests]
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory | |
| t/t3412-rebase-root.sh | diffblobblamehistory |