docs(cherry-pick): document CHERRY_PICK_HEAD ref#2243
docs(cherry-pick): document CHERRY_PICK_HEAD ref#2243spaceone wants to merge 1 commit intogit:masterfrom
Conversation
Welcome to GitGitGadgetHi @spaceone, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests. Please make sure that either:
You can CC potential reviewers by adding a footer to the PR description with the following syntax: NOTE: DO NOT copy/paste your CC list from a previous GGG PR's description, Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:
It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code. Contributing the patchesBefore you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form Both the person who commented An alternative is the channel Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment If you want to see what email(s) would be sent for a After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail). If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the curl -g --user "<EMailAddress>:<Password>" \
--url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txtTo iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description): To send a new iteration, just add another PR comment with the contents: Need help?New contributors who want advice are encouraged to join git-mentoring@googlegroups.com, where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join. You may also be able to find help in real time in the developer IRC channel, |
|
/allow |
|
User spaceone is now allowed to use GitGitGadget. WARNING: spaceone has no public email address set on GitHub; GitGitGadget needs an email address to Cc: you on your contribution, so that you receive any feedback on the Git mailing list. Go to https://github.com/settings/profile to make your preferred email public to let GitGitGadget know which email address to use. |
|
@spaceone you will want to enhance the commit message before contributing that patch. The Git project's reviewers are very picky. A former colleague of mine was bitten by this and wrote up valuable guidance at https://github.blog/2022-06-30-write-better-commits-build-better-projects/; I think that this part is particularly relevant, outlining what to focus on:
|
When a cherry-pick stops due to conflicts, it is not always obvious which commit is currently being applied or how to inspect its changes. Although the CHERRY_PICK_HEAD reference is mentioned in the documentation, it can be easy to overlook and is not presented as a practical way to inspect the in-progress commit. Add an example showing `git show CHERRY_PICK_HEAD` to make this workflow more discoverable. This provides a simple and flexible way to inspect the current commit, similar in spirit to `rebase --show-current-patch`, without introducing new options. Signed-off-by: Florian Best <best@univention.de>
8c9c2bd to
900acb1
Compare
|
@dscho Thank you. I added a commit message body. |
No description provided.