diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-05 18:33:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-05 18:33:16 -0700 |
| commit | 08b51f51e6a4cf2f5ad4b893707f1337a450e499 (patch) | |
| tree | 1ff3a0c83f79c221194ac91ee6c2018d477ec7af /Documentation/pretty-formats.txt | |
| parent | 1fc561d169ac08c411e34a4439894c5201b3d080 (diff) | |
| parent | 9b373229506c9f563b2e2f053c3f1d932789fbfd (diff) | |
| download | git-08b51f51e6a4cf2f5ad4b893707f1337a450e499.tar.gz git-08b51f51e6a4cf2f5ad4b893707f1337a450e499.tar.xz | |
Merge branch 'qq/maint'
* qq/maint:
clone -q: honor "quiet" option over native transports.
attribute documentation: keep EXAMPLE at end
builtin-commit.c: Use 'git_config_string' to get 'commit.template'
http.c: Use 'git_config_string' to clean up SSL config.
diff.c: Use 'git_config_string' to get 'diff.external'
convert.c: Use 'git_config_string' to get 'smudge' and 'clean'
builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix'
Documentation cvs: Clarify when a bare repository is needed
Documentation: be precise about which date --pretty uses
Conflicts:
Documentation/gitattributes.txt
Diffstat (limited to 'Documentation/pretty-formats.txt')
| -rw-r--r-- | Documentation/pretty-formats.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index ec3755579..69e6d2fa4 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -30,7 +30,7 @@ This is designed to be as compact as possible. commit <sha1> Author: <author> - Date: <date> + Date: <author date> <title line> @@ -50,9 +50,9 @@ This is designed to be as compact as possible. commit <sha1> Author: <author> - AuthorDate: <date & time> + AuthorDate: <author date> Commit: <committer> - CommitDate: <date & time> + CommitDate: <committer date> <title line> @@ -62,7 +62,7 @@ This is designed to be as compact as possible. From <sha1> <date> From: <author> - Date: <date & time> + Date: <author date> Subject: [PATCH] <title line> <full commit message> |