Merge branch 'jk/reflog-date'
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:48:37 +0000 (14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:48:37 +0000 (14:48 -0700)
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

1  2 
Documentation/rev-list-options.txt
builtin/blame.c
cache.h
Simple merge
diff --cc builtin/blame.c
Simple merge
diff --cc cache.h
Simple merge