summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorWilliam Duclot <william.duclot@gmail.com>2017-07-16 21:42:20 +0200
committerJunio C Hamano <gitster@pobox.com>2017-07-17 14:58:19 -0700
commit5fdacc17c7eb2a7b435d62d99b41f75f44f74de1 (patch)
treeecd483717b8430bb5115fa6bd52b4d109e434608 /git-rebase.sh
parentf3da2b79be9565779e4f76dc5812c68e156afdf0 (diff)
downloadgit-5fdacc17c7eb2a7b435d62d99b41f75f44f74de1.tar.gz
rebase: make resolve message clearer for inexperienced userswd/rebase-conflict-guide
The git UI can be improved by addressing the error messages to those they help: inexperienced and casual git users. To this intent, it is helpful to make sure the terms used in those messages can be understood by this segment of users, and that they guide them to resolve the problem. In particular, failure to apply a patch during a git rebase is a common problem that can be very destabilizing for the inexperienced user. It is important to lead them toward the resolution of the conflict (which is a 3-steps process, thus complex) and reassure them that they can escape a situation they can't handle with "--abort". This commit answer those two points by detailling the resolution process and by avoiding cryptic git linguo. Signed-off-by: William Duclot <william.duclot@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 2cf73b88e8..f8b3d1fd97 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -55,9 +55,10 @@ 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".')
+$(gettext 'Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".')
"
unset onto
unset restrict_revision