| Message ID | 3d06c3beee0299db369f1dd859b092d529bd6846.1620551314.git.martin.agren@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8c9ca6f095ed421897a2a816ac36f6d82f684d7b |
| Headers | show |
| Series | minor doc fixes | expand |
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/
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
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 ;-)
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.
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(-)