X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.c;h=5b85b4077a1d3e333d6af86127bf9473b295c837;hb=692be9f365be09160f8baa1d6d521d0f65ec4cf9;hp=0484601f42a8aeac408d560091d341f571f231dd;hpb=9e8f6e7f6e8817db30a492e32fa92c1daf51b77c;p=git.git

diff --git a/diff.c b/diff.c
index 0484601f4..5b85b4077 100644
--- a/diff.c
+++ b/diff.c
@@ -118,7 +118,9 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
 	}
 
 	/* like GNU diff's --suppress-blank-empty option  */
-	if (!strcmp(var, "diff.suppress-blank-empty")) {
+	if (!strcmp(var, "diff.suppressblankempty") ||
+			/* for backwards compatibility */
+			!strcmp(var, "diff.suppress-blank-empty")) {
 		diff_suppress_blank_empty = git_config_bool(var, value);
 		return 0;
 	}