global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-31 12:00:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sd/log-decorate' into next

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2010-05-04 17:50:12 -07:00
parent 9ff84b0ded 4f62c2bc57
commit 6e54ae9998
8 changed files with 118 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cache.h
View File

@@ -946,6 +946,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 *);