summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-08 21:35:52 -0700
committerJunio C Hamano <gitster@pobox.com>2016-09-08 21:35:52 -0700
commitf59c6e6ccb1386f0fdde2753f62536dfd3343118 (patch)
treec270485f41e5100c47da29fe0e5b6e432bc438ba /cache.h
parent7f5885ad2abfbf9b760e2f32f70537d1c380734d (diff)
parent442f6fd3d6272b1c7b92e0a24b4be1cf162b4d04 (diff)
downloadgit-f59c6e6ccb1386f0fdde2753f62536dfd3343118.tar.gz
Merge branch 'jk/reflog-date' into maint
The reflog output format is documented better, and a new format --date=unix to report the seconds-since-epoch (without timezone) has been added. * jk/reflog-date: date: clarify --date=raw description date: add "unix" format date: document and test "raw-local" mode doc/pretty-formats: explain shortening of %gd doc/pretty-formats: describe index/time formats for %gd doc/rev-list-options: explain "-g" output formats doc/rev-list-options: clarify "commit@{Nth}" for "-g" option
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index c0d6cdb60c..1fd2d5dc3e 100644
--- a/cache.h
+++ b/cache.h
@@ -1224,7 +1224,8 @@ struct date_mode {
DATE_ISO8601_STRICT,
DATE_RFC2822,
DATE_STRFTIME,
- DATE_RAW
+ DATE_RAW,
+ DATE_UNIX
} type;
const char *strftime_fmt;
int local;