diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-19 21:30:21 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 21:30:21 +0300 |
| commit | d97c62c828d6f0eb7ba7067c8c24793620900dd8 (patch) | |
| tree | 53941cdc41e6ad573859ee63c570499b869fc967 /builtin/commit.c | |
| parent | b4b8c35729985a8f1f5e22f82259a2499efbc37a (diff) | |
| parent | dcb500dc16ce8db556b51e9a5b3fa977111d0443 (diff) | |
Merge branch 'ra/cherry-pick-revert-skip'
"git cherry-pick/revert" learned a new "--skip" action.
* ra/cherry-pick-revert-skip:
cherry-pick/revert: advise using --skip
cherry-pick/revert: add --skip option
sequencer: use argv_array in reset_merge
sequencer: rename reset_for_rollback to reset_merge
sequencer: add advice for revert
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 3e4b5bfe4e..ae7aaf6dc6 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -60,15 +60,18 @@ N_("The previous cherry-pick is now empty, possibly due to conflict resolution.\ "\n"); static const char empty_cherry_pick_advice_single[] = -N_("Otherwise, please use 'git reset'\n"); +N_("Otherwise, please use 'git cherry-pick --skip'\n"); static const char empty_cherry_pick_advice_multi[] = -N_("If you wish to skip this commit, use:\n" +N_("and then use:\n" "\n" -" git reset\n" +" git cherry-pick --continue\n" "\n" -"Then \"git cherry-pick --continue\" will resume cherry-picking\n" -"the remaining commits.\n"); +"to resume cherry-picking the remaining commits.\n" +"If you wish to skip this commit, use:\n" +"\n" +" git cherry-pick --skip\n" +"\n"); static const char *color_status_slots[] = { [WT_STATUS_HEADER] = "header", |