Hi,
On Mon, 26 Jan 2009, Thomas Rast wrote:
> Johannes Schindelin wrote:
> >
> > When we rebase with --root, what we are actually picking are the commits
> > in $ONTO..$HEAD. So $ONTO is really our $UPSTREAM. Spell it out.
> [...]
> > + UPSTREAM=$ONTO
>
> While I think the simplification is reasonable, it breaks this check:
>
> get_saved_options () {
> # ...
> test ! -s "$DOTEST"/upstream && REBASE_ROOT=t
> }
>
> So you'll have to change that too.
Will fix tomorrow.
Thanks,
Dscho
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
