Hi, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > > + --onto) > > + shift > > + ONTO=$(git rev-parse --verify "$1") || > > + die "Does not point to a valid commit: $1" > > Didn't you have some check earlier that "--onto" can only be used when > starting a rebase? Yes, and I still have. is_standalone does that: # check if no other options are set is_standalone () { test $# -eq 2 -a "$2" = '--' && test -z "$ONTO" && test -z "$PRESERVE_MERGES" && test -z "$STRATEGY" && test -z "$VERBOSE" } which is called on --continue/--abort/--skip before the saved options are loaded again. Regards. -- Stephan Beyer <s-beyer@xxxxxxx>, PGP 0x6EDDD207FCC5040F -- 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