From 86c91f91794cd6af8e19fbe68ab283d567d2b66f Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Tue, 4 Aug 2009 13:16:49 +0200 Subject: git apply: option to ignore whitespace differences Introduce --ignore-whitespace option and corresponding config bool to ignore whitespace differences while applying patches, akin to the 'patch' program. 'git am', 'git rebase' and the bash git completion are made aware of this option. Signed-off-by: Giuseppe Bilotta Signed-off-by: Junio C Hamano --- cache.h | 1 + 1 file changed, 1 insertion(+) (limited to 'cache.h') diff --git a/cache.h b/cache.h index e6c7f3307d..695212fca9 100644 --- a/cache.h +++ b/cache.h @@ -509,6 +509,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; -- cgit v1.2.1