[PATCH/WIP 7/8] rebase: move resolvemsg to rebase--* scripts
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 23:04:11
Subsystem:
the rest · Maintainer:
Linus Torvalds
--- git-rebase--am.sh | 5 +++++ git-rebase--interactive.sh | 5 +++++ git-rebase--merge.sh | 5 +++++ git-rebase.sh | 7 +------ 4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index ab84330..399956b 100755
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh@@ -9,6 +9,11 @@ set_reflog_action rebase require_work_tree_exists GIT_QUIET=$git_quiet +resolvemsg=" +$(gettext 'When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort".') +" write_basic_state () { echo "$head_name" > "$state_dir"/head-name &&
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index b1c71a9..337dec3 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh@@ -16,6 +16,11 @@ set_reflog_action "rebase -i ($action)" require_work_tree_exists GIT_QUIET=$git_quiet +resolvemsg=" +$(gettext 'When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort".') +" # The file containing rebase commands, comments, and empty lines. # This file is created by "git rebase -i" then edited by the user. As
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index baaef41..7e240be 100755
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh@@ -9,6 +9,11 @@ set_reflog_action rebase require_work_tree_exists GIT_QUIET=$git_quiet +resolvemsg=" +$(gettext 'When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort".') +" prec=4
diff --git a/git-rebase.sh b/git-rebase.sh
index d941239..38530e8 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh@@ -49,11 +49,6 @@ cd_to_toplevel LF=' ' ok_to_skip_pre_rebase= -resolvemsg=" -$(gettext 'When you have resolved this problem, run "git rebase --continue". -If you prefer to skip this patch, run "git rebase --skip" instead. -To check out the original branch and stop rebasing, run "git rebase --abort".') -" unset onto cmd= strategy=
@@ -139,7 +134,7 @@ run_specific_rebase () { git_quiet=$GIT_QUIET export GIT_PAGER export action allow_rerere_autoupdate git_am_opt git_quiet head_name keep_empty - export onto orig_head rebase_root resolvemsg revisions + export onto orig_head rebase_root revisions export state_dir verbose strategy strategy_opts export autosquash cmd force_rebase preserve_merges squash_onto switch_to upstream exec git-rebase--$type
--
2.3.0.rc1.137.g477eb31