diff options
| author | Kaartic Sivaraam <kaartic.sivaraam@gmail.com> | 2017-11-20 20:56:52 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-21 09:34:13 +0900 |
| commit | 82cb775c069642ca66f9703e196447242a6d4ea7 (patch) | |
| tree | 0429e29aadea652e4ea0d43fb52f9a9783a2fca8 | |
| parent | 42e6fde5c28150206956ea4be490d886c4ecbd68 (diff) | |
| download | git-ks/rebase-no-git-foo.tar.gz | |
git-rebase: clean up dashed-usages in messagesks/rebase-no-git-foo
Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 2cf73b88e8..7dccc4c5f8 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 @@ -214,7 +214,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 |