Merge branch 'master' into js/c-merge-recursive

Adjust to hold_lock_file_for_update() change on the master.

1 files changed, 5 insertions, 0 deletions

diff --git a/config.c b/config.c
index 0ac6aebbbc..82b3562454 100644
--- a/config.c
+++ b/config.c
@@ -309,6 +309,11 @@ int git_default_config(const char *var, const char *value)
 		return 0;
 	}
 
+	if (!strcmp(var, "pager.color")) {
+		pager_use_color = git_config_bool(var,value);
+		return 0;
+	}
+
 	/* Add other config variables here and to Documentation/config.txt. */
 	return 0;
 }