> git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>]
> [<branch>]
> git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
> -git-rebase --continue | --abort | --skip | --edit-todo
> +git rebase --continue | --abort | --skip | --edit-todo
A good change.
> test -f "$apply_dir"/applying &&
> - die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
> + die "$(gettext "It looks like you are in the middle of an am session.
> Cannot rebase.")"
Probably not, as 'am' alone would be confusing.
"It looks like 'git am' is in progress. Cannot rebase."
may be a more sensible improvement.
