Merge branch 'js/commit-format'
authorJunio C Hamano <junkio@cox.net>
Fri, 2 Mar 2007 08:37:12 +0000 (00:37 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 2 Mar 2007 08:37:12 +0000 (00:37 -0800)
* js/commit-format:
  show_date(): rename the "relative" parameter to "mode"
  Actually make print_wrapped_text() useful
  pretty-formats: add 'format:<string>'

1  2 
cache.h
commit.c
commit.h

diff --cc cache.h
Simple merge
diff --cc commit.c
Simple merge
diff --cc commit.h
Simple merge