Two small things I noticed while going through the doc-diff between v2.31.0 and master ("The fourteenth batch").
Martin Ågren (2): git-repack.txt: remove spurious ")" pretty-formats.txt: add missing space
Documentation/git-repack.txt | 2 +- Documentation/pretty-formats.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
-- 2.31.1.751.gd2f1c929bd
[PATCH 1/2] git-repack.txt: remove spurious ")"
Drop the ")" at the end of this paragraph. There's a parenthetical remark in this paragraph, but it's been closed on the line above.
Signed-off-by: Martin Ågren <martin.agren@gmail.com> --- Documentation/git-repack.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index 317d63cf0d..ef310f362e 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -186,7 +186,7 @@ When `--unpacked` is specified, loose objects are implicitly included in this "roll-up", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of -option to `git repack`). +option to `git repack`. CONFIGURATION -------------
-- 2.31.1.751.gd2f1c929bd
[PATCH 2/2] pretty-formats.txt: add missing space
The description of "%ch" is missing a space after "human style", before the parenthetical remark. This description was introduced in b722d4560e ("pretty: provide human date format", 2021-04-25). That commit also added "%ah", which does have the space already.
Signed-off-by: Martin Ågren <martin.agren@gmail.com> --- Documentation/pretty-formats.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index cd697f508c..58bb279528 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -208,7 +208,7 @@ The placeholders are: '%ci':: committer date, ISO 8601-like format '%cI':: committer date, strict ISO 8601 format '%cs':: committer date, short format (`YYYY-MM-DD`) -'%ch':: committer date, human style(like the `--date=human` option of +'%ch':: committer date, human style (like the `--date=human` option of linkgit:git-rev-list[1]) '%d':: ref names, like the --decorate option of linkgit:git-log[1] '%D':: ref names without the " (", ")" wrapping.
-- 2.31.1.751.gd2f1c929bd
ZheNing HuRe: [PATCH 2/2] pretty-formats.txt: add missing space
Martin Ågren <martin.agren@gmail.com> 于2021年5月9日周日 下午5:10写道：
>
> The description of "%ch" is missing a space after "human style", before
> the parenthetical remark. This description was introduced in b722d4560e
> ("pretty: provide human date format", 2021-04-25). That commit also
> added "%ah", which does have the space already.
>
> Signed-off-by: Martin Ågren <martin.agren@gmail.com>
> ---
> Documentation/pretty-formats.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
> index cd697f508c..58bb279528 100644
> --- a/Documentation/pretty-formats.txt
> +++ b/Documentation/pretty-formats.txt
> @@ -208,7 +208,7 @@ The placeholders are:
> '%ci':: committer date, ISO 8601-like format
> '%cI':: committer date, strict ISO 8601 format
> '%cs':: committer date, short format (`YYYY-MM-DD`)
> -'%ch':: committer date, human style(like the `--date=human` option of
> +'%ch':: committer date, human style (like the `--date=human` option of
> linkgit:git-rev-list[1])
> '%d':: ref names, like the --decorate option of linkgit:git-log[1]
> '%D':: ref names without the " (", ")" wrapping.
> --
> 2.31.1.751.gd2f1c929bd
>Sorry, but in here:[1], I have fixed this space missing error.
Junio, this patch have not been merged to master?
[1]: https://lore.kernel.org/git/pull.939.v4.git.1620056221874.gitgitgadget@gmail.com/
Re: [PATCH 2/2] pretty-formats.txt: add missing space
On Sun, 9 May 2021 at 16:13, ZheNing Hu <adlternative@gmail.com> wrote:
>
> Martin Ågren <martin.agren@gmail.com> 于2021年5月9日周日 下午5:10写道：
> >
> > The description of "%ch" is missing a space after "human style", before
> > the parenthetical remark. This description was introduced in b722d4560e
> > ("pretty: provide human date format", 2021-04-25). That commit also
> > added "%ah", which does have the space already.> > --- a/Documentation/pretty-formats.txt > > +++ b/Documentation/pretty-formats.txt > > @@ -208,7 +208,7 @@ The placeholders are: > > '%ci':: committer date, ISO 8601-like format > > '%cI':: committer date, strict ISO 8601 format > > '%cs':: committer date, short format (`YYYY-MM-DD`) > > -'%ch':: committer date, human style(like the `--date=human` option of > > +'%ch':: committer date, human style (like the `--date=human` option of > > linkgit:git-rev-list[1])
> Sorry, but in here:[1], I have fixed this space missing error. > > Junio, this patch have not been merged to master? > > [1]: https://lore.kernel.org/git/pull.939.v4.git.1620056221874.gitgitgadget@gmail.com/
Ah, thanks for the pointer. It looks like this was merged to "next" in 2320ad8fb0 ("Merge branch 'zh/pretty-date-human' into next", 2021-04-30), so a few days before you sent v4.
Junio probably missed v4 entirely, or he might have responded with something like "v3 is already in next, so please build incrementally on top of it".
Thanks for contributing this functionality. I quite like the "human" format.
Martin
Junio C HamanoRe: [PATCH 2/2] pretty-formats.txt: add missing space
Martin Ågren <martin.agren@gmail.com> writes:
> Ah, thanks for the pointer. It looks like this was merged to "next" in
> 2320ad8fb0 ("Merge branch 'zh/pretty-date-human' into next", 2021-04-30), so a
> few days before you sent v4.
>
> Junio probably missed v4 entirely, or he might have responded with something
> like "v3 is already in next, so please build incrementally on top of it".
>
> Thanks for contributing this functionality. I quite like the "human" format.Thanks, I think that is exactly what happened, except that I wrote the message but it is still in my draft mailbox without being sent ;-)