status: mention --skip for revert and cherry-pick
When reverting or cherry-picking, one of the options we can pass the sequencer is `--skip`. However, unlike rebasing, `--skip` is not mentioned as a possible option in the status message. Mention it so that users are more aware of their options. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Aug 27, 2019 at 00:45 UTC
86ae43da6a6edbe7fbd9226ef316b894aef9da21
2 files changed
+10
t/t7512-status-help.sh
+6
@@ -733,6 +733,7 @@ test_expect_success 'status when cherry-picking before resolving conflicts' '
733
On branch cherry_branch
734
You are currently cherry-picking commit $TO_CHERRY_PICK.
735
(fix conflicts and run "git cherry-pick --continue")
736
+ (use "git cherry-pick --skip" to skip this patch)
737
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
738
739
Unmerged paths:
@@ -757,6 +758,7 @@ test_expect_success 'status when cherry-picking after resolving conflicts' '
758
On branch cherry_branch
759
You are currently cherry-picking commit $TO_CHERRY_PICK.
760
(all conflicts fixed: run "git cherry-pick --continue")
761
+ (use "git cherry-pick --skip" to skip this patch)
762
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
763
764
Changes to be committed:
@@ -778,6 +780,7 @@ test_expect_success 'status when cherry-picking after committing conflict resolu
780
On branch cherry_branch
781
Cherry-pick currently in progress.
782
(run "git cherry-pick --continue" to continue)
783
+ (use "git cherry-pick --skip" to skip this patch)
784
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
785
786
nothing to commit (use -u to show untracked files)
@@ -835,6 +838,7 @@ test_expect_success 'status while reverting commit (conflicts)' '
838
On branch master
839
You are currently reverting commit $TO_REVERT.
840
(fix conflicts and run "git revert --continue")
841
+ (use "git revert --skip" to skip this patch)
842
(use "git revert --abort" to cancel the revert operation)
843
844
Unmerged paths:
@@ -855,6 +859,7 @@ test_expect_success 'status while reverting commit (conflicts resolved)' '
859
On branch master
860
You are currently reverting commit $TO_REVERT.
861
(all conflicts fixed: run "git revert --continue")
862
+ (use "git revert --skip" to skip this patch)
863
(use "git revert --abort" to cancel the revert operation)
864
865
Changes to be committed:
@@ -887,6 +892,7 @@ test_expect_success 'status while reverting after committing conflict resolution
892
On branch master
893
Revert currently in progress.
894
(run "git revert --continue" to continue)
895
+ (use "git revert --skip" to skip this patch)
896
(use "git revert --abort" to cancel the revert operation)
897
898
nothing to commit (use -u to show untracked files)
wt-status.c
+4
@@ -1433,6 +1433,8 @@ static void show_cherry_pick_in_progress(struct wt_status *s,
1433
else
1434
status_printf_ln(s, color,
1435
_(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1436
+ status_printf_ln(s, color,
1437
+ _(" (use \"git cherry-pick --skip\" to skip this patch)"));
1438
status_printf_ln(s, color,
1439
_(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1440
}
@@ -1460,6 +1462,8 @@ static void show_revert_in_progress(struct wt_status *s,
1462
else
1463
status_printf_ln(s, color,
1464
_(" (all conflicts fixed: run \"git revert --continue\")"));
1465
+ status_printf_ln(s, color,
1466
+ _(" (use \"git revert --skip\" to skip this patch)"));
1467
status_printf_ln(s, color,
1468
_(" (use \"git revert --abort\" to cancel the revert operation)"));
1469
}