diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-01 17:06:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-01 17:06:12 -0800 |
| commit | e1a0c8b1483b38d32d3870408e03a6c1b340aa15 (patch) | |
| tree | 7b803af235c934438e1133095c0ade9f4843db27 /cache.h | |
| parent | git-mv: fixes for path handling (diff) | |
| parent | git-am: --whitespace=x option. (diff) | |
| download | git-1.2.4.tar.gz git-1.2.4.zip | |
Merge branch 'lt/fix-apply' into maintv1.2.4
* lt/fix-apply:
git-am: --whitespace=x option.
git-apply: war on whitespace -- finishing touches.
git-apply --whitespace=nowarn
apply --whitespace: configuration option.
apply: squelch excessive errors and --whitespace=error-all
apply --whitespace fixes and enhancements.
The war on trailing whitespace
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; |