Skip to content

Commit 82cb775

Browse files
sivaraamgitster
authored andcommitted
git-rebase: clean up dashed-usages in messages
Signed-off-by: Kaartic Sivaraam <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 42e6fde commit 82cb775

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-rebase.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ OPTIONS_STUCKLONG=t
99
OPTIONS_SPEC="\
1010
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
1111
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
1313
--
1414
Available options are
1515
v,verbose! display a diffstat of what changed upstream
@@ -214,7 +214,7 @@ run_pre_rebase_hook () {
214214
}
215215

216216
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.")"
218218

219219
if test -d "$apply_dir"
220220
then

0 commit comments

Comments
 (0)