* [PATCH 0/2] minor doc fixes
@ 2021-05-09 9:09 Martin Ågren
2021-05-09 9:09 ` [PATCH 1/2] git-repack.txt: remove spurious ")" Martin Ågren
2021-05-09 9:10 ` [PATCH 2/2] pretty-formats.txt: add missing space Martin Ågren
0 siblings, 2 replies; 6+ messages in thread
From: Martin Ågren @ 2021-05-09 9:09 UTC (permalink / raw)
To: git; +Cc: ZheNing Hu, Taylor Blau
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
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] git-repack.txt: remove spurious ")" 2021-05-09 9:09 [PATCH 0/2] minor doc fixes Martin Ågren @ 2021-05-09 9:09 ` Martin Ågren 2021-05-09 9:10 ` [PATCH 2/2] pretty-formats.txt: add missing space Martin Ågren 1 sibling, 0 replies; 6+ messages in thread From: Martin Ågren @ 2021-05-09 9:09 UTC (permalink / raw) To: git; +Cc: ZheNing Hu, Taylor Blau 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] pretty-formats.txt: add missing space 2021-05-09 9:09 [PATCH 0/2] minor doc fixes Martin Ågren 2021-05-09 9:09 ` [PATCH 1/2] git-repack.txt: remove spurious ")" Martin Ågren @ 2021-05-09 9:10 ` Martin Ågren 2021-05-09 14:13 ` ZheNing Hu 1 sibling, 1 reply; 6+ messages in thread From: Martin Ågren @ 2021-05-09 9:10 UTC (permalink / raw) To: git; +Cc: ZheNing Hu, Taylor Blau 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] pretty-formats.txt: add missing space 2021-05-09 9:10 ` [PATCH 2/2] pretty-formats.txt: add missing space Martin Ågren @ 2021-05-09 14:13 ` ZheNing Hu 2021-05-09 15:27 ` Martin Ågren 0 siblings, 1 reply; 6+ messages in thread From: ZheNing Hu @ 2021-05-09 14:13 UTC (permalink / raw) To: Martin Ågren; +Cc: Git List, Taylor Blau, Junio C Hamano 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/ ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] pretty-formats.txt: add missing space 2021-05-09 14:13 ` ZheNing Hu @ 2021-05-09 15:27 ` Martin Ågren 2021-05-10 4:14 ` Junio C Hamano 0 siblings, 1 reply; 6+ messages in thread From: Martin Ågren @ 2021-05-09 15:27 UTC (permalink / raw) To: ZheNing Hu; +Cc: Git List, Taylor Blau, Junio C Hamano 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] pretty-formats.txt: add missing space 2021-05-09 15:27 ` Martin Ågren @ 2021-05-10 4:14 ` Junio C Hamano 0 siblings, 0 replies; 6+ messages in thread From: Junio C Hamano @ 2021-05-10 4:14 UTC (permalink / raw) To: Martin Ågren; +Cc: ZheNing Hu, Git List, Taylor Blau 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 ;-) ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-10 4:14 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-05-09 9:09 [PATCH 0/2] minor doc fixes Martin Ågren 2021-05-09 9:09 ` [PATCH 1/2] git-repack.txt: remove spurious ")" Martin Ågren 2021-05-09 9:10 ` [PATCH 2/2] pretty-formats.txt: add missing space Martin Ågren 2021-05-09 14:13 ` ZheNing Hu 2021-05-09 15:27 ` Martin Ågren 2021-05-10 4:14 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).