global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 02:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/diff--cached' into next

Browse Source 
* jc/diff--cached:
  Revert "git-diff: Introduce --index and deprecate --cached."
  git-svn: correctly display fatal() error messages
  git-svn: exit with status 1 for test failures
  Allow subcommand.color and color.subcommand color configuration
  git-push: document removal of remote ref with :<dst> pathspec
This commit is contained in:
Junio C Hamano
2006-12-13 02:03:31 -08:00
parent c6995d9fe0 f2dd1c9adf
commit 72f55187cd
9 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
diff.c
View File

@@ -60,7 +60,7 @@ int git_diff_ui_config(const char *var, const char *value)
diff_rename_limit_default = git_config_int(var, value);
return 0;
}
if (!strcmp(var, "diff.color")) {
if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
diff_use_color_default = git_config_colorbool(var, value);
return 0;
}
@@ -74,7 +74,7 @@ int git_diff_ui_config(const char *var, const char *value)
diff_detect_rename_default = DIFF_DETECT_RENAME;
return 0;
}
if (!strncmp(var, "diff.color.", 11)) {
if (!strncmp(var, "diff.color.", 11) || !strncmp(var, "color.diff.", 11)) {
int slot = parse_diff_color_slot(var, 11);
color_parse(value, var, diff_colors[slot]);
return 0;