This patch fixes the bug when git cherry-pick is used with environment variable GIT_CHERRY_PICK_HELP, and makes git chery-pick advice message better. v3: https://lore.kernel.org/git/pull.1007.git.1627561665.gitgitgadget@xxxxxxxxx/ v3-->v4: 1. Add hidden option --delete-cherry-pick-head to git cherry-pick wihch used to delete CHERRY_PICK_HEAD when conflict occurs. 2. add delete_cherry_pick_head flag to struct replay_opts and struct rebase_options. 3. Split print_advice() into print advice and delete CHERRY_PICK_HEAD two part. 4. Use better git cherry-pick advice message. ZheNing Hu (2): [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP [GSOC] cherry-pick: use better advice message builtin/rebase.c | 3 +++ builtin/revert.c | 2 ++ git-rebase--preserve-merges.sh | 2 +- sequencer.c | 37 +++++++++++++++++------------- sequencer.h | 1 + t/t3507-cherry-pick-conflict.sh | 40 ++++++++++++++++++++------------- 6 files changed, 53 insertions(+), 32 deletions(-) base-commit: daab8a564f8bbac55f70f8bf86c070e001a9b006 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1010%2Fadlternative%2Fcherry-pick-help-fix-3-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1010/adlternative/cherry-pick-help-fix-3-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/1010 -- gitgitgadget
