Merge branch 'maint'

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 3558348b720aa62d6a34719daed5fb623a10501d..dfcef79a6b772ae5fb11fc378772042ba465615f 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -13,7 +13,7 @@ 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". `log.date` config variable sets a default