From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Jan 2010 23:35:55 +0000 (-0800)
Subject: Merge branch 'mv/commit-date'
X-Git-Tag: v1.7.0-rc0~127
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=762c710b3673009f3ee7b2f4f9321b68d52fca72;p=git.git

Merge branch 'mv/commit-date'

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

762c710b3673009f3ee7b2f4f9321b68d52fca72
diff --cc builtin-commit.c
index 3dfcd77c4,9a1264aaf..073fe90ba
--- a/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"),