aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-03 09:43:42 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-03 09:43:42 -0700
commitc0808fe70870f513a4fc020ec23500b88f8b1018 (patch)
tree6a5eb5d86124b2ec7d756a25c267978aedb7abc0 /Documentation/config.txt
parent2b916ffa18cb163a9d8f0060a9127e9b0a84b955 (diff)
parenta5218458009620ba5142438b01a0032ee00ea395 (diff)
downloadgit-c0808fe70870f513a4fc020ec23500b88f8b1018.tar.gz
git-c0808fe70870f513a4fc020ec23500b88f8b1018.tar.xz
Merge branch 'jn/doc-backslash'
* jn/doc-backslash: Documentation: remove stray backslash in show-branch discussion Documentation: remove stray backslashes from "Fighting regressions" article Documentation: do not convert ... operator to ellipses Documentation: avoid stray backslash in user manual Documentation: avoid stray backslashes in core tutorial Documentation: remove stray backslashes in rev-parse manual Documentation: remove backslash before ~ in fast-import manual Documentation: remove stray backslash from "git bundle" manual Documentation/technical: avoid stray backslash in parse-options API docs Documentation: remove backslashes in manpage synopses Documentation: clarify quoting in gitignore docs Documentation: clarify quoting in "git rm" example Documentation: add missing quotes to "git grep" examples Documentation: clarify quoting in "git add" example Documentation: unbreak regex in show-ref manual Documentation: quoting trouble in "git rm" discussion Documentation: tweak description of log.date
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 61831f60c..0510ac795 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1305,10 +1305,11 @@ interactive.singlekey::
ignored if portable keystroke input is not available.
log.date::
- Set default date-time mode for the log command. Setting log.date
- value is similar to using 'git log'\'s --date option. The value is one of the
- following alternatives: {relative,local,default,iso,rfc,short}.
- See linkgit:git-log[1].
+ Set the default date-time mode for the 'log' command.
+ Setting a value for log.date is similar to using 'git log''s
+ `\--date` option. Possible values are `relative`, `local`,
+ `default`, `iso`, `rfc`, and `short`; see linkgit:git-log[1]
+ for details.
log.decorate::
Print out the ref names of any commits that are shown by the log