From: Junio C Hamano Date: Tue, 17 Dec 2013 19:34:41 +0000 (-0800) Subject: Merge branch 'jj/rev-list-options-doc' into maint X-Git-Tag: v1.8.5.2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7be001dfbf77f8f116556a24878b50190c4745e1;p=thirdparty%2Fgit.git Merge branch 'jj/rev-list-options-doc' into maint * jj/rev-list-options-doc: Documentation/rev-list-options.txt: fix some grammatical issues and typos Documentation/rev-list-options.txt: fix mark-up --- 7be001dfbf77f8f116556a24878b50190c4745e1 diff --cc Documentation/rev-list-options.txt index ec86d09199,e286a8b022..2991d70a4a --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@@ -711,16 -655,14 +655,14 @@@ include::pretty-options.txt[ Synonym for `--date=relative`. --date=(relative|local|default|iso|rfc|short|raw):: - Only takes effect for dates shown in human-readable format, such - as when using "--pretty". `log.date` config variable sets a default - value for log command's --date option. + as when using `--pretty`. `log.date` config variable sets a default + value for the log command's `--date` option. + `--date=relative` shows dates relative to the current time, - e.g. "2 hours ago". + e.g. ``2 hours ago''. + -`--date=local` shows timestamps in user's local timezone. +`--date=local` shows timestamps in user's local time zone. + `--date=iso` (or `--date=iso8601`) shows timestamps in ISO 8601 format. +