mirror of
https://github.com/git/git
synced 2024-08-24 10:15:51 +00:00
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
This commit is contained in:
commit
88e2efcbc4
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue