git-rebase: clean up dashed-usages in messages
Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kaartic Sivaraam committed
Nov 20, 2017 at 20:56 UTC
82cb775c069642ca66f9703e196447242a6d4ea7
1 file changed
+2
-2
git-rebase.sh
+2
-2
@@ -9,7 +9,7 @@ OPTIONS_STUCKLONG=t
9
OPTIONS_SPEC="\
10
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
11
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
12
-git-rebase --continue | --abort | --skip | --edit-todo
12
+git rebase --continue | --abort | --skip | --edit-todo
13
--
14
Available options are
15
v,verbose! display a diffstat of what changed upstream
@@ -214,7 +214,7 @@ run_pre_rebase_hook () {
214
}
215
216
test -f "$apply_dir"/applying &&
217
- die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
217
+ die "$(gettext "It looks like 'git am' is in progress. Cannot rebase.")"
218
219
if test -d "$apply_dir"
220
then