diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 22:06:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 22:06:34 +0200 |
| commit | 073d0b0914af3a9c958175fde5c8f2cc278498db (patch) | |
| tree | 0024f68fed38ec103d5ab6d3ca8a7313d66ac664 /Documentation/pretty-options.txt | |
| parent | mailmap: use main email address for dturner (diff) | |
| parent | doc: change configuration variables format (diff) | |
| download | git-073d0b0914af3a9c958175fde5c8f2cc278498db.tar.xz git-073d0b0914af3a9c958175fde5c8f2cc278498db.zip | |
Merge branch 'tr/doc-tt' into maint
The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
* tr/doc-tt:
doc: change configuration variables format
doc: more consistency in environment variables format
doc: change environment variables format
doc: clearer rule about formatting literals
Diffstat (limited to 'Documentation/pretty-options.txt')
| -rw-r--r-- | Documentation/pretty-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index 6c67182728..e44fc8f738 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -26,7 +26,7 @@ people using 80-column terminals. --no-abbrev-commit:: Show the full 40-byte hexadecimal commit object name. This negates `--abbrev-commit` and those options which imply it such as - "--oneline". It also overrides the 'log.abbrevCommit' variable. + "--oneline". It also overrides the `log.abbrevCommit` variable. --oneline:: This is a shorthand for "--pretty=oneline --abbrev-commit" @@ -65,7 +65,7 @@ ifndef::git-rev-list[] on the command line. + By default, the notes shown are from the notes refs listed in the -'core.notesRef' and 'notes.displayRef' variables (or corresponding +`core.notesRef` and `notes.displayRef` variables (or corresponding environment overrides). See linkgit:git-config[1] for more details. + With an optional '<treeish>' argument, use the treeish to find the notes |