diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-09 09:36:14 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-09 09:36:14 +0400 |
| commit | 72d9b222a940c93a8d915c26a4d5d077e23be871 (patch) | |
| tree | b1bfaf4991ee3edf1410ef4e5dff3a5475746795 /cache.h | |
| parent | e251a7b34a85b0ac8a63a31e899e070ea2a330c7 (diff) | |
| parent | 4f62c2bc577bbb85b65f3261c7fab7ef74def4cd (diff) | |
Merge branch 'sd/log-decorate'
* sd/log-decorate:
log.decorate: only ignore it under "log --pretty=raw"
script with rev-list instead of log
log --pretty/--oneline: ignore log.decorate
log.decorate: usability fixes
Add `log.decorate' configuration variable.
git_config_maybe_bool()
Conflicts:
builtin/log.c
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -944,6 +944,7 @@ extern int git_config_int(const char *, const char *); extern unsigned long git_config_ulong(const char *, const char *); extern int git_config_bool_or_int(const char *, const char *, int *); extern int git_config_bool(const char *, const char *); +extern int git_config_maybe_bool(const char *, const char *); extern int git_config_string(const char **, const char *, const char *); extern int git_config_pathname(const char **, const char *, const char *); extern int git_config_set(const char *, const char *); |