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

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-log.txt
Simple merge

diff --cc builtin/log.c
index 6208703c061abb868201073795cf516bf81b2602,017fcf82ce3705335e5548b193e4d590e4949c62..976e16f9f2e6e5f8e2229d90caae9f7df4d75309
--- 1/builtin/log.c
--- 2/builtin-log.c
+++ b/builtin/log.c
@@@ -31,12 -32,28 +32,29 @@@ static const char * const builtin_log_u
        "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
        "   or: git show [options] <object>...";
  
+ static int parse_decoration_style(const char *var, const char *value)
+ {
+       switch (git_config_maybe_bool(var, value)) {
+       case 1:
+               return DECORATE_SHORT_REFS;
+       case 0:
+               return 0;
+       default:
+               break;
+       }
+       if (!strcmp(value, "full"))
+               return DECORATE_FULL_REFS;
+       else if (!strcmp(value, "short"))
+               return DECORATE_SHORT_REFS;
+       return -1;
+ }
+ 
  static void cmd_log_init(int argc, const char **argv, const char *prefix,
 -                    struct rev_info *rev)
 +                       struct rev_info *rev, struct setup_revision_opt *opt)
  {
        int i;
-       int decoration_style = 0;
+       int decoration_given = 0;
 +      struct userformat_want w;
  
        rev->abbrev = DEFAULT_ABBREV;
        rev->commit_format = CMIT_FMT_DEFAULT;

diff --cc cache.h
Simple merge

diff --cc git-stash.sh
Simple merge

diff --cc git-submodule.sh
Simple merge