aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-02 00:37:12 -0800
committerJunio C Hamano <junkio@cox.net>2007-03-02 00:37:12 -0800
commit8ab3e1858676b91bf351537b8afd5599c6640e6f (patch)
tree65c62d7da49d1c397ee0ae063803c1cb56eb9ac5 /cache.h
parent8b969a5fb5e5891d9ad4c236fd9487c4673bfa2a (diff)
parentf8493ec09bcdbd616084dcfa6f5b8ca0bbb68acf (diff)
downloadgit-8ab3e1858676b91bf351537b8afd5599c6640e6f.tar.gz
git-8ab3e1858676b91bf351537b8afd5599c6640e6f.tar.xz
Merge branch 'js/commit-format'
* js/commit-format: show_date(): rename the "relative" parameter to "mode" Actually make print_wrapped_text() useful pretty-formats: add 'format:<string>'
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index b84e3decf..8018b2cd3 100644
--- a/cache.h
+++ b/cache.h
@@ -327,7 +327,8 @@ extern void *read_object_with_reference(const unsigned char *sha1,
unsigned long *size,
unsigned char *sha1_ret);
-const char *show_date(unsigned long time, int timezone, int relative);
+enum date_mode { DATE_NORMAL = 0, DATE_RELATIVE, DATE_SHORT };
+const char *show_date(unsigned long time, int timezone, enum date_mode mode);
const char *show_rfc2822_date(unsigned long time, int timezone);
int parse_date(const char *date, char *buf, int bufsize);
void datestamp(char *buf, int bufsize);