diff options
| -rw-r--r-- | Documentation/pretty-formats.txt | 4 | ||||
| -rw-r--r-- | pretty.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index dc865cbb27..f3f2024e51 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -120,6 +120,8 @@ The placeholders are: - '%at': author date, UNIX timestamp - '%ai': author date, ISO 8601-like format - '%aI': author date, strict ISO 8601 format +- '%as': author date, short format +- '%aR': author date, raw format - '%cn': committer name - '%cN': committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1]) @@ -132,6 +134,8 @@ The placeholders are: - '%ct': committer date, UNIX timestamp - '%ci': committer date, ISO 8601-like format - '%cI': committer date, strict ISO 8601 format +- '%cs': committer date, short format +- '%cR': committer date, raw format - '%d': ref names, like the --decorate option of linkgit:git-log[1] - '%D': ref names without the " (", ")" wrapping. - '%e': encoding @@ -723,6 +723,12 @@ static size_t format_person_part(struct strbuf *sb, char part, case 'I': /* date, ISO 8601 strict */ strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(ISO8601_STRICT))); return placeholder_len; + case 's': /* date, short */ + strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(SHORT))); + return placeholder_len; + case 'R': /* date, raw */ + strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(RAW))); + return placeholder_len; } skip: |