summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-08-08 14:48:37 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-08 14:48:37 -0700
commit0d3279962acab475a523cfde04a79761ff12f147 (patch)
treefad754df313d62263ae9e316ff2a50ae603be71c /cache.h
parentMerge branch 'cp/completion-clone-recurse-submodules' (diff)
parentdate: clarify --date=raw description (diff)
downloadtgif-0d3279962acab475a523cfde04a79761ff12f147.tar.xz
Merge branch 'jk/reflog-date'
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 b5f76a4cf4..6cddf2c1de 100644
--- a/cache.h
+++ b/cache.h
@@ -1230,7 +1230,8 @@ struct date_mode {
DATE_ISO8601_STRICT,
DATE_RFC2822,
DATE_STRFTIME,
- DATE_RAW
+ DATE_RAW,
+ DATE_UNIX
} type;
const char *strftime_fmt;
int local;