diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:39:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:39:38 -0700 |
| commit | 49981d8a250837019b4a14f44d471fc6ff7e334f (patch) | |
| tree | c3394268eaaade296d7de692fe7e76bacb3be97b /git-rebase.sh | |
| parent | 0202c411edc25940cc381bf317badcdf67670be4 (diff) | |
| parent | 6ebdac1bab966b720d776aa43ca188fe378b1f4b (diff) | |
| download | git-49981d8a250837019b4a14f44d471fc6ff7e334f.tar.gz git-49981d8a250837019b4a14f44d471fc6ff7e334f.tar.xz | |
Start maintenance track for 2.10.x series
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 44ede367a..04f6e44bc 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -45,7 +45,6 @@ skip! skip current patch and continue edit-todo! edit the todo list during an interactive rebase " . git-sh-setup -. git-sh-i18n set_reflog_action rebase require_work_tree_exists cd_to_toplevel @@ -154,7 +153,7 @@ move_to_original_branch () { git symbolic-ref \ -m "rebase finished: returning to $head_name" \ HEAD $head_name || - die "$(gettext "Could not move back to $head_name")" + die "$(eval_gettext "Could not move back to \$head_name")" ;; esac } @@ -449,7 +448,7 @@ then then . git-parse-remote error_on_missing_default_upstream "rebase" "rebase" \ - "against" "git rebase <branch>" + "against" "git rebase $(gettext '<branch>')" fi test "$fork_point" = auto && fork_point=t |