diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-26 10:05:22 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-26 21:23:19 -0800 |
| commit | a6c7a27691bd8b059d39c9bc71b19fb8e614fa54 (patch) | |
| tree | c053419f4960e656f292569d0e6c754d7cc396b7 /sha1_file.c | |
| parent | f7d9d04e3be697989c960881f9b0d50f1ea6a6be (diff) | |
| download | git-a6c7a27691bd8b059d39c9bc71b19fb8e614fa54.tar.gz git-a6c7a27691bd8b059d39c9bc71b19fb8e614fa54.tar.xz | |
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>
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions