diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:35:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:35:52 -0700 |
| commit | f59c6e6ccb1386f0fdde2753f62536dfd3343118 (patch) | |
| tree | c270485f41e5100c47da29fe0e5b6e432bc438ba /builtin/merge-index.c | |
| parent | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint (diff) | |
| parent | date: clarify --date=raw description (diff) | |
| download | tgif-f59c6e6ccb1386f0fdde2753f62536dfd3343118.tar.xz | |
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 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions