diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-08-05 13:00:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-05 13:00:20 -0700 |
| commit | fb5657082148297b61fbca7e64d51c1e7870309a (patch) | |
| tree | 14ab782877318041066b734607db98c4b4c6c362 /Documentation/pretty-options.txt | |
| parent | Merge branch 'es/blame-L-breakage' (diff) | |
| parent | fix typo in documentation of git-svn (diff) | |
| download | tgif-fb5657082148297b61fbca7e64d51c1e7870309a.tar.xz | |
Sync with maint to grab trivial doc fixes
* maint:
fix typo in documentation of git-svn
Documentation/rev-list-options: add missing word in --*-parents
log doc: the argument to --encoding is not optional
Diffstat (limited to 'Documentation/pretty-options.txt')
| -rw-r--r-- | Documentation/pretty-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index 5e499421a4..eea0e306a8 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -28,7 +28,7 @@ people using 80-column terminals. This is a shorthand for "--pretty=oneline --abbrev-commit" used together. ---encoding[=<encoding>]:: +--encoding=<encoding>:: The commit objects record the encoding used for the log message in their encoding header; this option can be used to tell the command to re-code the commit log message in the encoding |