Merge branch 'mv/commit-date'

* mv/commit-date:
  Document date formats accepted by parse_date()
  builtin-commit: add --date option

diff --cc Documentation/git-commit.txt
Simple merge

diff --cc builtin-commit.c
index 3dfcd77c45253f3fb8a0c50ed1cff44c365dce90,9a1264aaf879ed87816dc02b0008651a458e63e1..073fe90ba1e04c3845fe49521db39b28339acb43
--- 1/builtin-commit.c
--- 2/builtin-commit.c
+++ b/builtin-commit.c
@@@ -94,10 -86,11 +94,11 @@@ static int opt_parse_m(const struct opt
  static struct option builtin_commit_options[] = {
        OPT__QUIET(&quiet),
        OPT__VERBOSE(&verbose),
 -      OPT_GROUP("Commit message options"),
  
 +      OPT_GROUP("Commit message options"),
        OPT_FILENAME('F', "file", &logfile, "read log from file"),
        OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
+       OPT_STRING(0, "date", &force_date, "DATE", "override date for commit"),
        OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
        OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit"),
        OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),