Merge git://ozlabs.org/~paulus/gitk

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 31bee069aa90d2f1c12f709c5e60e71ce4ffa199..f1c52208f08c3dc9f50e8d18f546a96276a47fec 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -729,6 +729,11 @@ format, often found in email messages.
 +
 `--date=raw` shows the date in the internal raw Git format `%s %z` format.
 +
+`--date=format:...` feeds the format `...` to your system `strftime`.
+Use `--date=format:%c` to show the date in your system locale's
+preferred format.  See the `strftime` manual for a complete list of
+format placeholders.
++
 `--date=default` shows timestamps in the original time zone
 (either committer's or author's).