mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ra/cherry-pick-revert-skip'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2019-07-19 11:30:21 -07:00
parent b4b8c35729 dcb500dc16
commit d97c62c828
11 changed files with 266 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/commit.c
View File

@ -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",