Merge branch 'ap/svn'

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index ce6a1017a34aed25efc192e889a9f04adb5aa2f3..dfcef79a6b772ae5fb11fc378772042ba465615f 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -13,10 +13,11 @@ include::pretty-options.txt[]
 
        Synonym for `--date=relative`.
 
---date={relative,local,default,iso,rfc}::
+--date={relative,local,default,iso,rfc,short}::
 
        Only takes effect for dates shown in human-readable format, such
-       as when using "--pretty".
+       as when using "--pretty". `log.date` config variable sets a default
+       value for log command's --date option.
 +
 `--date=relative` shows dates relative to the current time,
 e.g. "2 hours ago".