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-formats.txt | |
| parent | 225c93a3cac93e8c619e5c8af47d2a781eedcacd (diff) | |
| parent | 761a889a97a33d277f8a6607a4696164391f9d5d (diff) | |
| download | git-bdc4204119d2847ea8f1ae5e44614be859951822.tar.gz git-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-formats.txt')
| -rw-r--r-- | Documentation/pretty-formats.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index bd760d3bd..b055a673d 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -76,9 +76,9 @@ displayed in full, regardless of whether --abbrev or true parent commits, without taking grafts nor history simplification into account. -* 'format:' +* 'format:<string>' + -The 'format:' format allows you to specify which information +The 'format:<string>' format allows you to specify which information you want to show. It works a little bit like printf format, with the notable exception that you get a newline with '%n' instead of '\n'. |