aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorMartin Langhoff <martin@catalyst.net.nz>2006-05-08 10:03:37 +1200
committerMartin Langhoff <martin@catalyst.net.nz>2006-05-08 10:03:37 +1200
commit50c08d48722149d95f46bcc80a5211ea04b8a809 (patch)
tree15c465be37ba4fdd8824edb95085b81076b73af9 /cache.h
parenta248c9614fdd130229fb5f9565abbd77bd1d0cc9 (diff)
parentbe65e7d9fbd3ae6fc097cedade2afe39805fcf4e (diff)
downloadgit-50c08d48722149d95f46bcc80a5211ea04b8a809.tar.xz
Merge with git://kernel.org/pub/scm/git/git.git
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index a4f253ec25..9d0ddcff01 100644
--- a/cache.h
+++ b/cache.h
@@ -169,7 +169,7 @@ extern void rollback_index_file(struct cache_file *);
/* Environment bits from configuration mechanism */
extern int trust_executable_bit;
extern int assume_unchanged;
-extern int only_use_symrefs;
+extern int prefer_symlink_refs;
extern int warn_ambiguous_refs;
extern int diff_rename_limit_default;
extern int shared_repository;