summaryrefslogtreecommitdiff
path: root/Documentation/pretty-formats.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-13 18:21:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-13 18:21:00 (GMT)
commitce987457ca3db0c78d5e720f753adf210fd3dd65 (patch)
tree046f8a309909cda113775f81e0d4bb08f2b1f658 /Documentation/pretty-formats.txt
parenta9f80f3dd4dc68ec6e9898805ccac2bb44c563ab (diff)
parent95a2618f60a61fae8097695255419f257f74dff9 (diff)
downloadgit-ce987457ca3db0c78d5e720f753adf210fd3dd65.zip
git-ce987457ca3db0c78d5e720f753adf210fd3dd65.tar.gz
git-ce987457ca3db0c78d5e720f753adf210fd3dd65.tar.bz2
Merge branch 'wp/pretty-enhancement'
* wp/pretty-enhancement: pretty: initialize new cmt_fmt_map to 0 pretty: add aliases for pretty formats pretty: add infrastructure for commit format aliases pretty: make it easier to add new formats
Diffstat (limited to 'Documentation/pretty-formats.txt')
-rw-r--r--Documentation/pretty-formats.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index b055a67..8c68ce9 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -11,7 +11,12 @@ 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:
+There are several built-in formats, and you can define
+additional formats by setting a pretty.<name>
+config option to either another format name, or a
+'format:' string, as described below (see
+linkgit:git-config[1]). Here are the details of the
+built-in formats:
* 'oneline'