Kaartic Sivaraam <[email protected]> writes:
> Signed-off-by: Kaartic Sivaraam <[email protected]>
> ---
Thanks. Two fewer git-foo exposed to the end user. Good ;-)
> git-rebase.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/git-rebase.sh b/git-rebase.sh
> index 6344e8d5e..2f5d138a0 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -9,7 +9,7 @@ OPTIONS_STUCKLONG=t
> OPTIONS_SPEC="\
> 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
> --
> Available options are
> v,verbose! display a diffstat of what changed upstream
> @@ -216,7 +216,7 @@ run_pre_rebase_hook () {
> }
>
> test -f "$apply_dir"/applying &&
> - die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
> + die "$(gettext "It looks like 'git am' is in progress. Cannot rebase.")"
>
> if test -d "$apply_dir"
> then
