summaryrefslogtreecommitdiffstats
path: root/pretty-formats.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-11-23 02:47:33 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-11-23 02:47:33 +0000
commita340aaa88e7e6b3c6e57e248e0c3a67e8b9067a3 (patch)
tree107d8903207e448548a78bf0f2b8a78be671410e /pretty-formats.txt
parent0df3434818ed2fc0bf60acd6b5a3a925d95d349d (diff)
downloadgit-htmldocs-a340aaa88e7e6b3c6e57e248e0c3a67e8b9067a3.tar.gz
Autogenerated HTML docs for v1.4.4.1
Diffstat (limited to 'pretty-formats.txt')
-rw-r--r--pretty-formats.txt78
1 files changed, 78 insertions, 0 deletions
diff --git a/pretty-formats.txt b/pretty-formats.txt
new file mode 100644
index 000000000..996f62890
--- /dev/null
+++ b/pretty-formats.txt
@@ -0,0 +1,78 @@
+--pretty[='<format>']::
+
+ Pretty-prints the details of a commit. `--pretty`
+ without an explicit `=<format>` defaults to 'medium'.
+ If the commit is a merge, and if the pretty-format
+ is not 'oneline', 'email' or 'raw', an additional line is
+ inserted before the 'Author:' line. This line begins with
+ "Merge: " and the sha1s of ancestral commits are printed,
+ separated by spaces. Note that the listed commits may not
+ necessarily be the list of the *direct* parent commits if you
+ have limited your view of history: for example, if you are
+ only interested in changes related to a certain directory or
+ file. Here are some additional details for each format:
+
+ * 'oneline'
+
+ <sha1> <title line>
++
+This is designed to be as compact as possible.
+
+ * 'short'
+
+ commit <sha1>
+ Author: <author>
+
+ <title line>
+
+ * 'medium'
+
+ commit <sha1>
+ Author: <author>
+ Date: <date>
+
+ <title line>
+
+ <full commit message>
+
+ * 'full'
+
+ commit <sha1>
+ Author: <author>
+ Commit: <committer>
+
+ <title line>
+
+ <full commit message>
+
+ * 'fuller'
+
+ commit <sha1>
+ Author: <author>
+ AuthorDate: <date & time>
+ Commit: <committer>
+ CommitDate: <date & time>
+
+ <title line>
+
+ <full commit message>
+
+
+ * 'email'
+
+ From <sha1> <date>
+ From: <author>
+ Date: <date & time>
+ Subject: [PATCH] <title line>
+
+ full commit message>
+
+
+ * 'raw'
++
+The 'raw' format shows the entire commit exactly as
+stored in the commit object. Notably, the SHA1s are
+displayed in full, regardless of whether --abbrev or
+--no-abbrev are used, and 'parents' information show the
+true parent commits, without taking grafts nor history
+simplification into account.