Johannes Schindelin wrote:
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
> ---
> git-rebase--interactive.sh | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index 6e2bf25..5df35b2 100755
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -571,7 +571,8 @@ first and then run 'git rebase --continue' again."
> ;;
> --)
> shift
> - test ! -z "$REBASE_ROOT" -o $# -eq 1 -o $# -eq 2 || usage
> + test -z "$REBASE_ROOT" -a $# -ge 1 -a $# -le 2 ||
> + test ! -z "$REBASE_ROOT" -a $# -le 1 || usage
> test -d "$DOTEST" &&
> die "Interactive rebase already started"
Acked-by: Thomas Rast <trast@xxxxxxxxxxxxxxx>
I'll postpone 1/2 till I've had enough sleep to check whether
--continue ever needed to know about --root, and either remove or fix
the remembering. (Sorry for the noise.)
--
Thomas Rast
trast@{inf,student}.ethz.ch
Attachment:
signature.asc
Description: This is a digitally signed message part.
