From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Nov 2017 02:06:39 +0000 (+0900)
Subject: Merge branch 'ks/rebase-no-git-foo'
X-Git-Tag: v2.16.0-rc0~93
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/88e2efcbc415f234d38e6e1c59c8d8ae03c989b3?hp=51affbd52ddc09f3af156031da8d5d29dfcd1801

Merge branch 'ks/rebase-no-git-foo'

Mentions of "git-rebase" and "git-am" (dashed form) still remained
in end-user visible strings emitted by the "git rebase" command;
they have been corrected.

* ks/rebase-no-git-foo:
git-rebase: clean up dashed-usages in messages
---

diff --git a/git-rebase.sh b/git-rebase.sh
index aabbf6b69e..60b70f3def 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