Merge branch 'master' of git://people.freedesktop.org/~hausmann/git-p4

[git.git] / revision.c

diff --git a/revision.c b/revision.c
index 27cce090a1dea5b050f057c2bf3b3e3bd8699a07..28b5f2eacebf637323fa0af112ea568beb95c7f3 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1133,6 +1133,14 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                        if (!strncmp(arg, "--date=", 7)) {
                                if (!strcmp(arg + 7, "relative"))
                                        revs->date_mode = DATE_RELATIVE;
+                               else if (!strcmp(arg + 7, "iso8601") ||
+                                        !strcmp(arg + 7, "iso"))
+                                       revs->date_mode = DATE_ISO8601;
+                               else if (!strcmp(arg + 7, "rfc2822") ||
+                                        !strcmp(arg + 7, "rfc"))
+                                       revs->date_mode = DATE_RFC2822;
+                               else if (!strcmp(arg + 7, "short"))
+                                       revs->date_mode = DATE_SHORT;
                                else if (!strcmp(arg + 7, "local"))
                                        revs->date_mode = DATE_LOCAL;
                                else if (!strcmp(arg + 7, "default"))