summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-14 11:46:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-14 11:46:16 -0700
commitadc3a81ce21754595d6263c78f3ceac5b9bb30d9 (patch)
tree63fb0bf78dce58d485a43215f1aaa63e7006ebe4 /commit.h
parentMerge branch 'jk/doc-asciidoc-inline-literal' into maint (diff)
parentreflog-walk: tell explicit --date=default from not having --date at all (diff)
downloadtgif-adc3a81ce21754595d6263c78f3ceac5b9bb30d9.tar.xz
Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint
Gives a better DWIM behaviour for --pretty=format:%gd, "stash list", and "log -g", depending on how the starting point ("master" vs "master@{0}" vs "master@{now}") and date formatting options (e.g. "--date=iso") are given on the command line. By Jeff King (4) and Junio C Hamano (1) * jk/maint-reflog-walk-count-vs-time: reflog-walk: tell explicit --date=default from not having --date at all reflog-walk: always make HEAD@{0} show indexed selectors reflog-walk: clean up "flag" field of commit_reflog struct log: respect date_mode_explicit with --format:%gd t1411: add more selector index/date tests
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index 154c0e34ff..205eea3382 100644
--- a/commit.h
+++ b/commit.h
@@ -82,6 +82,7 @@ struct pretty_print_context {
const char *after_subject;
int preserve_subject;
enum date_mode date_mode;
+ unsigned date_mode_explicit:1;
int need_8bit_cte;
int show_notes;
struct reflog_walk_info *reflog_info;