aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-21 01:08:10 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-21 01:08:10 -0800
commitf873dd5ac22fee648f9097d5a91200b6f4850ae0 (patch)
treeeffdbc042e8919b36c92faca7707f84bbbac2a07 /diff.c
parent2b5189e51855312a91dd23b5e7311c48944bc382 (diff)
parent950db8798d51cb183c858938263425b367b21dfd (diff)
downloadgit-f873dd5ac22fee648f9097d5a91200b6f4850ae0.tar.gz
git-f873dd5ac22fee648f9097d5a91200b6f4850ae0.tar.xz
Merge branch 'maint'
* maint: Rename diff.suppress-blank-empty to diff.suppressBlankEmpty
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index d23548292..073131316 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;
}