]> granicus.if.org Git - git/commitdiff
Merge branch 'jk/reflog-date' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:52 +0000 (21:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:52 +0000 (21:35 -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