diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-27 02:06:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-27 02:06:39 (GMT) |
| commit | 88e2efcbc415f234d38e6e1c59c8d8ae03c989b3 (patch) | |
| tree | 731d879555549822c61743d0c9f42e2283ad6516 /git-rebase.sh | |
| parent | 51affbd52ddc09f3af156031da8d5d29dfcd1801 (diff) | |
| parent | 82cb775c069642ca66f9703e196447242a6d4ea7 (diff) | |
| download | git-88e2efcbc415f234d38e6e1c59c8d8ae03c989b3.zip git-88e2efcbc415f234d38e6e1c59c8d8ae03c989b3.tar.gz git-88e2efcbc415f234d38e6e1c59c8d8ae03c989b3.tar.bz2 | |
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
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index aabbf6b..60b70f3 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 |