Merge branch 'lt/log-auto-decorate'

* lt/log-auto-decorate: git log: support "auto" decorations
git-mirror · Jun 16, 2014 · 3009afd · 3009afd
2 parents 668668a + 1571586
commit 3009afd
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/builtin/log.c b/builtin/log.c
@@ -63,6 +63,8 @@ static int parse_decoration_style(const char *var, const char *value)
 		return DECORATE_FULL_REFS;
 	else if (!strcmp(value, "short"))
 		return DECORATE_SHORT_REFS;
+	else if (!strcmp(value, "auto"))
+		return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0;
 	return -1;
 }