Skip to content
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

doc: fix capitalization in porcelain v2 section #1095

Closed
wants to merge 1 commit into from

Conversation

orgads
Copy link
Contributor

@orgads orgads commented Sep 26, 2021

The summary line had xy, while the description (and other sub-sections)
has XY.

Signed-off-by: Orgad Shaneh orgads@gmail.com

@orgads
Copy link
Contributor Author

orgads commented Sep 26, 2021

/submit

@gitgitgadget-git
Copy link

There is an issue in commit b791d37:
Prefixed commit message must be in lower case: Documentation: Fix capitalization in porcelain v2 section

The summary line had xy, while the description (and other sub-sections)
has XY.

Signed-off-by: Orgad Shaneh <orgads@gmail.com>
@orgads orgads changed the title Documentation: Fix capitalization in porcelain v2 section doc: fix capitalization in porcelain v2 section Sep 26, 2021
@orgads
Copy link
Contributor Author

orgads commented Sep 26, 2021

/submit

@gitgitgadget-git
Copy link

Submitted as pull.1095.git.git.1632628082841.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git pr-git-1095/orgads/status-doc-v1

To fetch this version to local tag pr-git-1095/orgads/status-doc-v1:

git fetch --no-tags https://github.com/gitgitgadget/git tag pr-git-1095/orgads/status-doc-v1

@gitgitgadget-git
Copy link

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Orgad Shaneh via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Orgad Shaneh <orgads@gmail.com>
>
> The summary line had xy, while the description (and other sub-sections)
> has XY.
>
> Signed-off-by: Orgad Shaneh <orgads@gmail.com>
> ---
>     doc: fix capitalization in porcelain v2 section
>     
>     The summary line had xy, while the description (and other sub-sections)
>     has XY.
>     
>     Signed-off-by: Orgad Shaneh orgads@gmail.com
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1095%2Forgads%2Fstatus-doc-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1095/orgads/status-doc-v1
> Pull-Request: https://github.com/git/git/pull/1095
>
>  Documentation/git-status.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
> index 83f38e31981..c33a3d8d532 100644
> --- a/Documentation/git-status.txt
> +++ b/Documentation/git-status.txt
> @@ -363,7 +363,7 @@ Field       Meaning
>  Unmerged entries have the following format; the first character is
>  a "u" to distinguish from ordinary changed entries.
>  
> -    u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
> +    u <XY> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>

Makes sense.  Thanks.

@gitgitgadget-git
Copy link

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Orgad Shaneh via GitGitGadget" <gitgitgadget@gmail.com> writes:

> Subject: Re: [PATCH] doc: fix capitalization in porcelain v2 section
> From: Orgad Shaneh <orgads@gmail.com>

Between "doc" and "porcelain v2 section", there is this level called
"page" ;-) When this commit is mixed together with other commits in
"git shortlog" output, it will be hard to tell that this is about
fixing documentation for which command, so you must give it to your
readers.

    Subject: doc: match XY placeholder in status --porcelain-v2 output

or something like that, perhaps?

Thanks.

>
> The summary line had xy, while the description (and other sub-sections)
> has XY.
>
> Signed-off-by: Orgad Shaneh <orgads@gmail.com>
> ---
>     doc: fix capitalization in porcelain v2 section
>     
>     The summary line had xy, while the description (and other sub-sections)
>     has XY.
>     
>     Signed-off-by: Orgad Shaneh orgads@gmail.com
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1095%2Forgads%2Fstatus-doc-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1095/orgads/status-doc-v1
> Pull-Request: https://github.com/git/git/pull/1095
>
>  Documentation/git-status.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
> index 83f38e31981..c33a3d8d532 100644
> --- a/Documentation/git-status.txt
> +++ b/Documentation/git-status.txt
> @@ -363,7 +363,7 @@ Field       Meaning
>  Unmerged entries have the following format; the first character is
>  a "u" to distinguish from ordinary changed entries.
>  
> -    u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
> +    u <XY> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
>  
>  ....
>  Field       Meaning
>
> base-commit: ddb1055343948e0d0bc81f8d20245f1ada6430a0

@gitgitgadget-git
Copy link

On the Git mailing list, Orgad Shaneh wrote (reply to this):

On Mon, Sep 27, 2021 at 11:12 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> "Orgad Shaneh via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > Subject: Re: [PATCH] doc: fix capitalization in porcelain v2 section
> > From: Orgad Shaneh <orgads@gmail.com>
>
> Between "doc" and "porcelain v2 section", there is this level called
> "page" ;-) When this commit is mixed together with other commits in
> "git shortlog" output, it will be hard to tell that this is about
> fixing documentation for which command, so you must give it to your
> readers.
>
>     Subject: doc: match XY placeholder in status --porcelain-v2 output
>
> or something like that, perhaps?
>
> Thanks.
>
> >
> > The summary line had xy, while the description (and other sub-sections)
> > has XY.
> >
> > Signed-off-by: Orgad Shaneh <orgads@gmail.com>
> > ---
> >     doc: fix capitalization in porcelain v2 section
> >
> >     The summary line had xy, while the description (and other sub-sections)
> >     has XY.
> >
> >     Signed-off-by: Orgad Shaneh orgads@gmail.com
> >
> > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1095%2Forgads%2Fstatus-doc-v1
> > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1095/orgads/status-doc-v1
> > Pull-Request: https://github.com/git/git/pull/1095
> >
> >  Documentation/git-status.txt | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
> > index 83f38e31981..c33a3d8d532 100644
> > --- a/Documentation/git-status.txt
> > +++ b/Documentation/git-status.txt
> > @@ -363,7 +363,7 @@ Field       Meaning
> >  Unmerged entries have the following format; the first character is
> >  a "u" to distinguish from ordinary changed entries.
> >
> > -    u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
> > +    u <XY> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
> >
> >  ....
> >  Field       Meaning
> >
> > base-commit: ddb1055343948e0d0bc81f8d20245f1ada6430a0

Fine with me. Should I resubmit the patch, or will you push it with
the revised subject?

-  Orgad

@gitgitgadget-git
Copy link

This branch is now known as os/status-docfix.

@gitgitgadget-git
Copy link

This patch series was integrated into seen via a3f96f2.

@gitgitgadget-git
Copy link

On the Git mailing list, Junio C Hamano wrote (reply to this):

Orgad Shaneh <orgads@gmail.com> writes:

> Fine with me. Should I resubmit the patch, or will you push it with
> the revised subject?

I have (at least for now)

 doc: fix capitalization in "git status --porcelain=v2" description

on 'seen'; if you want to tweak it further, do not hesitate to send
updates.

Thanks.

@gitgitgadget-git
Copy link

This patch series was integrated into seen via 5cef92e.

@gitgitgadget-git
Copy link

This patch series was integrated into seen via cc10d39.

@gitgitgadget-git
Copy link

This patch series was integrated into seen via ca3f269.

@gitgitgadget-git
Copy link

There was a status update in the "New Topics" section about the branch os/status-docfix on the Git mailing list:

Docfix.

Will merge to 'next'.

@gitgitgadget-git
Copy link

This patch series was integrated into seen via c549d60.

@gitgitgadget-git
Copy link

This patch series was integrated into seen via 1526ba5.

@gitgitgadget-git
Copy link

This patch series was integrated into next via a130199.

@gitgitgadget-git gitgitgadget-git bot added the next label Oct 4, 2021
@gitgitgadget-git
Copy link

There was a status update in the "Cooking" section about the branch os/status-docfix on the Git mailing list:

Docfix.

Will merge to 'master'.

@gitgitgadget-git
Copy link

This patch series was integrated into seen via d3347c4.

@gitgitgadget-git
Copy link

This patch series was integrated into next via d3347c4.

@gitgitgadget-git
Copy link

This patch series was integrated into master via d3347c4.

@gitgitgadget-git
Copy link

Closed via d3347c4.

@gitgitgadget-git gitgitgadget-git bot closed this Oct 6, 2021
@orgads orgads deleted the status-doc branch October 7, 2021 02:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant