aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-21 18:47:48 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-21 18:47:48 -0700
commit5e092b5bcea48c098af7000f888a2a0f16c9db77 (patch)
treea7f8635ab1ad5542201d8d46f39d4672d3bd87b9 /cache.h
parentbcd45e27d8790d8981d4c6734bc573363121efd3 (diff)
parent86c91f91794cd6af8e19fbe68ab283d567d2b66f (diff)
downloadgit-5e092b5bcea48c098af7000f888a2a0f16c9db77.tar.gz
git-5e092b5bcea48c098af7000f888a2a0f16c9db77.tar.xz
Merge branch 'gb/apply-ignore-whitespace'
* gb/apply-ignore-whitespace: git apply: option to ignore whitespace differences
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 9222774e6..eee717c81 100644
--- a/cache.h
+++ b/cache.h
@@ -512,6 +512,7 @@ extern int log_all_ref_updates;
extern int warn_ambiguous_refs;
extern int shared_repository;
extern const char *apply_default_whitespace;
+extern const char *apply_default_ignorewhitespace;
extern int zlib_compression_level;
extern int core_compression_level;
extern int core_compression_seen;