summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-06 00:42:23 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-06 00:42:23 -0700
commit87d2062b3984af5347519c38877b99bce06e6e8d (patch)
tree888152f9e778342f6fa0fc71c7f601fd702916eb /Documentation
parenta6e5ef7d9cc34199fb6618e1fbb57f3615d002f6 (diff)
parent871d21d42e0f782b7cb111beec8c252e9aa627ff (diff)
downloadgit-87d2062b3984af5347519c38877b99bce06e6e8d.tar.gz
Merge branch 'sb/format-patch-patchname'
* sb/format-patch-patchname: format_sanitized_subject: Don't trim past initial length of strbuf log-tree: fix patch filename computation in "git format-patch" format-patch: --numbered-files and --stdout aren't mutually exclusive format-patch: --attach/inline uses filename instead of SHA1 format-patch: move get_patch_filename() into log-tree format-patch: pass a commit to reopen_stdout() format-patch: construct patch filename in one function pretty.c: add %f format specifier to format_commit_message()
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/pretty-formats.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 5c6e678aa3..2a845b1e57 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -121,6 +121,7 @@ The placeholders are:
- '%d': ref names, like the --decorate option of linkgit:git-log[1]
- '%e': encoding
- '%s': subject
+- '%f': sanitized subject line, suitable for a filename
- '%b': body
- '%Cred': switch color to red
- '%Cgreen': switch color to green