Merge branch 'jc/pretty-format-doc'

* jc/pretty-format-doc:
  "log --pretty" documentation: do not forget "tformat:"
This commit is contained in:
Junio C Hamano 2015-02-11 13:44:16 -08:00
commit afa3ccbf44

View File

@ -3,9 +3,13 @@
Pretty-print the contents of the commit logs in a given format, Pretty-print the contents of the commit logs in a given format,
where '<format>' can be one of 'oneline', 'short', 'medium', where '<format>' can be one of 'oneline', 'short', 'medium',
'full', 'fuller', 'email', 'raw' and 'format:<string>'. See 'full', 'fuller', 'email', 'raw', 'format:<string>'
the "PRETTY FORMATS" section for some additional details for each and 'tformat:<string>'. When '<format>' is none of the above,
format. When omitted, the format defaults to 'medium'. 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 Note: you can specify the default pretty format in the repository
configuration (see linkgit:git-config[1]). configuration (see linkgit:git-config[1]).