-
Notifications
You must be signed in to change notification settings - Fork 27.2k
doc: fix typo in git-pull.adoc #2111
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
Welcome to GitGitGadgetHi @snowdroppe, 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 [email protected], 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, |
|
There are issues in commit e9ccfc1: |
|
/allow |
|
User snowdroppe is now allowed to use GitGitGadget. WARNING: snowdroppe 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. |
|
/preview |
|
Error: Could not determine full name of snowdroppe |
|
/preview |
|
Preview email sent as [email protected] |
|
/submit |
|
Submitted as [email protected] To fetch this version into To fetch this version to local tag |
|
On the Git mailing list, "Kristoffer Haugsbakk" wrote (reply to this): Nice fix.
> docs(git-pull.adoc): fix man page typo
Correct, you need an “area” in front of the message. But if you want
something like “docs” it would be more typical/conventional with
something like this:
doc: pull:
or:
doc: git-pull:
And then for the rest you don’t need “man page typo” since we know that
this is a doc already. And “man page” is too specific since you can make
HTML as well. Maybe:
fix typo in command
On Fri, Nov 28, 2025, at 14:16, Stefan Rieche via GitGitGadget wrote:
> From: snowdroppe <[email protected]>
>
> Fix typo in man page from "git --rebase abort"
> to "git rebase --abort"
>
> Signed-off-by: Stefan Rieche <[email protected]>
The `From:` (author) and signoff line should match. See `real-name` in
`Documentation/SubmittingPatches`. Either a pseudonym or real/preferred
name. But it looks like you want to use your real name.
I see on the PR that you have used `snowdroppe <[email protected]>`
as the author on the commit. You can change your config for the project
to use the same name and email as the signoff line. Then
git commit --amend --reset-author
And force push to the branch on the remote.
> ---
> docs(git-pull.adoc): fix man page typo
>
> Published-As:
> https://github.com/gitgitgadget/git/releases/tag/pr-git-2111%2Fsnowdroppe%2Fmaster-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git
> pr-git-2111/snowdroppe/master-v1
> Pull-Request: https://github.com/git/git/pull/2111
>
> Documentation/git-pull.adoc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc
> index cd3bbc90e3..d3006359ed 100644
> --- a/Documentation/git-pull.adoc
> +++ b/Documentation/git-pull.adoc
> @@ -38,7 +38,7 @@ or `pull.ff` with your preferred behaviour.
>
> If there's a merge conflict during the merge or rebase that you don't
> want to handle, you can safely abort it with `git merge --abort` or `git
> ---rebase abort`.
> +rebase --abort`.
>
> OPTIONS
> -------
>
> base-commit: b31ab939fe8e3cbe8be48dddd1c6ac0265991f45
> --
> gitgitgadget |
|
User |
|
/preview |
|
Preview email sent as [email protected] |
|
/submit |
|
Submitted as [email protected] To fetch this version into To fetch this version to local tag |
|
On the Git mailing list, Junio C Hamano wrote (reply to this): "Kristoffer Haugsbakk" <[email protected]> writes:
> Nice fix.
>
>> docs(git-pull.adoc): fix man page typo
>
> Correct, you need an “area” in front of the message. But if you want
> something like “docs” it would be more typical/conventional with
> something like this:
>
> doc: pull:
>
> or:
>
> doc: git-pull:
or
doc: fix typo in git-pull.adoc
>> Fix typo in man page from "git --rebase abort"
>> to "git rebase --abort"
>>
>> Signed-off-by: Stefan Rieche <[email protected]>
>
> The `From:` (author) and signoff line should match. See `real-name` in
> `Documentation/SubmittingPatches`. Either a pseudonym or real/preferred
> name. But it looks like you want to use your real name.
>
> I see on the PR that you have used `snowdroppe <[email protected]>`
> as the author on the commit. You can change your config for the project
> to use the same name and email as the signoff line. Then
>
> git commit --amend --reset-author
>
> And force push to the branch on the remote.
Great. Which would mean that the in-body From: line early in the
message will also say Stefan Rieche, not snowdroppe.
Thanks for a review. |
|
/submit |
|
Error: a4a2c58 was already submitted |
Fix typo in git-pull.doc from "git --rebase abort" to "git rebase --abort" Signed-off-by: snowdroppe <[email protected]>
|
/preview |
|
Preview email sent as [email protected] |
|
/submit |
|
Submitted as [email protected] To fetch this version into To fetch this version to local tag |
|
Mmmmm |
|
De verdad pensé que todos ya sabían esto pero veo que no, ahora entiendo porque me hacker. Porque siempre estuvieron encima. |
Changes since v1:
cc: "Kristoffer Haugsbakk" [email protected], Junio C Hamano [email protected]