Merge branch 'jk/date-mode-format'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:27 +0000 (11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:27 +0000 (11:01 -0700)
commitd939af12bd96db7ad3e671a0585ad8570aa7e9d3
tree5772ac1192ed299db657ffcfbc71c318521db653
parent980a3d3dd742d534b394b04e578c2de5e3ee4793
parente4f031e34b08e3217c10942e682920a6939308a0
Merge branch 'jk/date-mode-format'

Teach "git log" and friends a new "--date=format:..." option to
format timestamps using system's strftime(3).

* jk/date-mode-format:
  strbuf: make strbuf_addftime more robust
  introduce "format" date-mode
  convert "enum date_mode" into a struct
  show-branch: use DATE_RELATIVE instead of magic number
12 files changed:
archive.c
builtin/blame.c
builtin/log.c
cache.h
commit.h
fast-import.c
log-tree.c
ref-filter.c
refs.c
revision.c
strbuf.c
strbuf.h