aboutsummaryrefslogtreecommitdiffstats
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-09 16:26:11 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-09 16:26:11 -0700
commit302e99b79a47e55274c9ba91bb7ac9d5d6292925 (patch)
tree30f47b6b1a8e12cf394d49c2f5154ce376912129 /revision.c
parent170a4814d382e79ea774813c99f12bb2a2922776 (diff)
parentf4ea32f0b48bc300afcb7c980c5a294deba31daa (diff)
downloadgit-302e99b79a47e55274c9ba91bb7ac9d5d6292925.tar.gz
Merge branch 'jk/reflog-date'
* jk/reflog-date: improve reflog date/number heuristic
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index 35eca4a361..9fc4e8d381 100644
--- a/revision.c
+++ b/revision.c
@@ -1159,8 +1159,10 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->simplify_history = 0;
} else if (!strcmp(arg, "--relative-date")) {
revs->date_mode = DATE_RELATIVE;
+ revs->date_mode_explicit = 1;
} else if (!strncmp(arg, "--date=", 7)) {
revs->date_mode = parse_date_format(arg + 7);
+ revs->date_mode_explicit = 1;
} else if (!strcmp(arg, "--log-size")) {
revs->show_log_size = 1;
}