File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ OPTIONS_STUCKLONG=t
9
9
OPTIONS_SPEC=" \
10
10
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
11
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
13
--
14
14
Available options are
15
15
v,verbose! display a diffstat of what changed upstream
@@ -214,7 +214,7 @@ run_pre_rebase_hook () {
214
214
}
215
215
216
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
218
219
219
if test -d " $apply_dir "
220
220
then
You can’t perform that action at this time.
0 commit comments