aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2009-01-20 22:08:33 +0100
committerJunio C Hamano <gitster@pobox.com>2009-01-21 00:17:40 -0800
commit950db8798d51cb183c858938263425b367b21dfd (patch)
tree6dbe1d6ef19ff138677f6319ad938b2d562168a6 /diff.c
parent674a1d2628628aa21c32ef98279f99ba3794a640 (diff)
downloadgit-950db8798d51cb183c858938263425b367b21dfd.tar.gz
git-950db8798d51cb183c858938263425b367b21dfd.tar.xz
Rename diff.suppress-blank-empty to diff.suppressBlankEmpty
All the other config variables use CamelCase. This config variable should not be an exception. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 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;
}