diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-02-27 14:47:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-27 17:36:00 -0800 |
| commit | 383e20b6144d01286c90c0c82d88f92173a038f6 (patch) | |
| tree | 58534cb00be6fd8b00ed6fce352754ea85f8b774 /cache.h | |
| parent | apply: squelch excessive errors and --whitespace=error-all (diff) | |
| download | tgif-383e20b6144d01286c90c0c82d88f92173a038f6.tar.xz | |
apply --whitespace: configuration option.
The new configuration option apply.whitespace can take one of
"warn", "error", "error-all", or "strip". When git-apply is run
to apply the patch to the index, they are used as the default
value if there is no command line --whitespace option.
Andrew can now tell people who feed him git trees to update to
this version and say:
git repo-config apply.whitespace error
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -160,10 +160,12 @@ extern int hold_index_file_for_update(struct cache_file *, const char *path); extern int commit_index_file(struct cache_file *); extern void rollback_index_file(struct cache_file *); +/* Environment bits from configuration mechanism */ extern int trust_executable_bit; extern int only_use_symrefs; extern int diff_rename_limit_default; extern int shared_repository; +extern const char *apply_default_whitespace; #define GIT_REPO_VERSION 0 extern int repository_format_version; |