diff options
| author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2009-08-04 13:16:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-05 11:59:56 -0700 |
| commit | 86c91f91794cd6af8e19fbe68ab283d567d2b66f (patch) | |
| tree | 2a8f3476997717ddf57d6dadd2c553461028d409 /environment.c | |
| parent | 07a4a3b4962e1fd4e40fd877427cddd7428c1bc3 (diff) | |
| download | git-86c91f91794cd6af8e19fbe68ab283d567d2b66f.tar.gz | |
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 <giuseppe.bilotta@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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; |