diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:48:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:48:37 -0700 |
| commit | 0d3279962acab475a523cfde04a79761ff12f147 (patch) | |
| tree | fad754df313d62263ae9e316ff2a50ae603be71c /builtin | |
| parent | 4c30ad8cc6d8eef7663336aa6345c631fa1f535d (diff) | |
| parent | 442f6fd3d6272b1c7b92e0a24b4be1cf162b4d04 (diff) | |
| download | git-0d3279962acab475a523cfde04a79761ff12f147.tar.gz | |
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 'builtin')
| -rw-r--r-- | builtin/blame.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index ab66cde2c2..2e7b3030c6 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2633,6 +2633,9 @@ parse_done: case DATE_RAW: blame_date_width = sizeof("1161298804 -0700"); break; + case DATE_UNIX: + blame_date_width = sizeof("1161298804"); + break; case DATE_SHORT: blame_date_width = sizeof("2006-10-19"); break; |