diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-02 10:17:26 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-02 10:17:26 -0700 |
commit | bdc4204119d2847ea8f1ae5e44614be859951822 (patch) | |
tree | ff641c05a79b4e5eb6d0428a2d6e2c55fe0935e9 /Documentation/pretty-options.txt | |
parent | Merge branch 'maint' (diff) | |
parent | git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX (diff) | |
download | tgif-bdc4204119d2847ea8f1ae5e44614be859951822.tar.xz |
Merge branch 'maint'
* maint:
git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX
Documentation: A...B shortcut for checkout and rebase
Documentation/pretty-{formats,options}: better reference for "format:<string>"
Diffstat (limited to 'Documentation/pretty-options.txt')
-rw-r--r-- | Documentation/pretty-options.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index af6d2b995a..d78e121c76 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -3,8 +3,9 @@ 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>'. - When omitted, the format defaults to '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'. + Note: you can specify the default pretty format in the repository configuration (see linkgit:git-config[1]). |