diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:44:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:44:16 -0800 |
| commit | afa3ccbf44cb47cf988c6f40ce3ddb10829a9e7b (patch) | |
| tree | c7f40dc3b6157aa5f073a0375d7dd10d588b1de3 | |
| parent | c985aaf87909ab7f8194b3cfed3a744cbff78fe9 (diff) | |
| parent | b4a56a3966e3da8f8c369f8f5674233d34d94999 (diff) | |
| download | git-afa3ccbf44cb47cf988c6f40ce3ddb10829a9e7b.tar.gz | |
Merge branch 'jc/pretty-format-doc'
* jc/pretty-format-doc:
"log --pretty" documentation: do not forget "tformat:"
| -rw-r--r-- | Documentation/pretty-options.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index 8569e29d08..74aa01a0ec 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -3,9 +3,13 @@ Pretty-print the contents of the commit logs in a given format, where '<format>' can be one of 'oneline', 'short', 'medium', - 'full', 'fuller', 'email', 'raw' and 'format:<string>'. See - the "PRETTY FORMATS" section for some additional details for each - format. When omitted, the format defaults to 'medium'. + 'full', 'fuller', 'email', 'raw', 'format:<string>' + and 'tformat:<string>'. When '<format>' is none of the above, + and has '%placeholder' in it, it acts as if + '--pretty=tformat:<format>' were given. ++ +See the "PRETTY FORMATS" section for some additional details for each +format. When '=<format>' part is omitted, it defaults to 'medium'. + Note: you can specify the default pretty format in the repository configuration (see linkgit:git-config[1]). |