diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-21 18:47:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-21 18:47:48 -0700 |
| commit | 5e092b5bcea48c098af7000f888a2a0f16c9db77 (patch) | |
| tree | a7f8635ab1ad5542201d8d46f39d4672d3bd87b9 /environment.c | |
| parent | bcd45e27d8790d8981d4c6734bc573363121efd3 (diff) | |
| parent | 86c91f91794cd6af8e19fbe68ab283d567d2b66f (diff) | |
| download | git-5e092b5bcea48c098af7000f888a2a0f16c9db77.tar.gz | |
Merge branch 'gb/apply-ignore-whitespace'
* gb/apply-ignore-whitespace:
git apply: option to ignore whitespace differences
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c index 8f5eaa7dd8..3cf88f58c4 100644 --- a/environment.c +++ b/environment.c @@ -26,6 +26,7 @@ const char *git_commit_encoding; const char *git_log_output_encoding; int shared_repository = PERM_UMASK; const char *apply_default_whitespace; +const char *apply_default_ignorewhitespace; int zlib_compression_level = Z_BEST_SPEED; int core_compression_level; int core_compression_seen; |