diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:13 -0700 |
| commit | 7b09c459d346d9bf30ab07921a9b0ee91405d104 (patch) | |
| tree | bfbb19307f204ca82609d0fcbb281aacb6277e4c /builtin/blame.c | |
| parent | 297ae7151f85b677e58d6804d35e88d1375abaeb (diff) | |
| parent | 99264e93fc87bdd61f646c53878782947d476da8 (diff) | |
| download | git-7b09c459d346d9bf30ab07921a9b0ee91405d104.tar.gz git-7b09c459d346d9bf30ab07921a9b0ee91405d104.tar.xz | |
Merge branch 'jk/date-local'
"git log --date=local" used to only show the normal (default)
format in the local timezone. The command learned to take 'local'
as an instruction to use the local timezone with other formats,
e.g. "git show --date=rfc-local".
* jk/date-local:
t6300: add tests for "-local" date formats
t6300: make UTC and local dates different
date: make "local" orthogonal to date format
date: check for "local" before anything else
t6300: add test for "raw" date format
t6300: introduce test_date() helper
fast-import: switch crash-report date to iso8601
Documentation/rev-list: don't list date formats
Documentation/git-for-each-ref: don't list date formats
Documentation/config: don't list date formats
Documentation/blame-options: don't list date formats
Diffstat (limited to 'builtin/blame.c')
| -rw-r--r-- | builtin/blame.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 4db01c195..6fd1a63fc 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2600,7 +2600,6 @@ parse_done: fewer display columns. */ blame_date_width = utf8_strwidth(_("4 years, 11 months ago")) + 1; /* add the null */ break; - case DATE_LOCAL: case DATE_NORMAL: blame_date_width = sizeof("Thu Oct 19 16:00:04 2006 -0700"); break; |