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 | |
| parent | 7f5885ad2abfbf9b760e2f32f70537d1c380734d (diff) | |
| parent | 442f6fd3d6272b1c7b92e0a24b4be1cf162b4d04 (diff) | |
| download | git-f59c6e6ccb1386f0fdde2753f62536dfd3343118.tar.gz git-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')
| -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 d123e2e6a..5e5d30ecb 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; |