diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:40:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:40:12 -0800 |
| commit | 0877510ad4e8b951b08f9cbb25cfc0d994468979 (patch) | |
| tree | dcfc43b1cf44ba49c3f9f206504d2f1cfee8bcc6 /Documentation/pretty-formats.txt | |
| parent | Merge branch 'jc/ident' (diff) | |
| parent | user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere (diff) | |
| download | tgif-0877510ad4e8b951b08f9cbb25cfc0d994468979.tar.xz | |
Merge branch 'jk/warn-author-committer-after-commit'
* jk/warn-author-committer-after-commit:
user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
commit.c::print_summary: do not release the format string too early
commit: allow suppression of implicit identity advice
commit: show interesting ident information in summary
strbuf: add strbuf_addbuf_percentquote
strbuf_expand: convert "%%" to "%"
Conflicts:
builtin-commit.c
ident.c
Diffstat (limited to 'Documentation/pretty-formats.txt')
| -rw-r--r-- | Documentation/pretty-formats.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 53a9168ba7..1686a54d22 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -134,6 +134,7 @@ The placeholders are: - '%C(...)': color specification, as described in color.branch.* config option - '%m': left, right or boundary mark - '%n': newline +- '%%': a raw '%' - '%x00': print a byte from a hex code - '%w([<w>[,<i1>[,<i2>]]])': switch line wrapping, like the -w option of linkgit:git-shortlog[1]. |