diff options
author | Junio C Hamano <junkio@cox.net> | 2006-03-21 00:15:21 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-03-21 00:15:21 -0800 |
commit | f1250edff5356cba7d8e71ec68418a4233b8bed0 (patch) | |
tree | f4db547180350e555fb267c24f3badad21ef7911 /cache.h | |
parent | 83c137928c77b83a3d5557bcff467cd020424442 (diff) | |
parent | 2f8acdb38e513e4b983209563faf4c1d38c4013e (diff) | |
download | git-f1250edff5356cba7d8e71ec68418a4233b8bed0.tar.gz git-f1250edff5356cba7d8e71ec68418a4233b8bed0.tar.xz |
Merge branch 'jc/name' into next
* jc/name:
core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.
contrib/git-svn: allow rebuild to work on non-linear remote heads
http-push: don't assume char is signed
http-push: add support for deleting remote branches
Be verbose when !initial commit
Fix multi-paragraph list items in OPTIONS section
http-fetch: nicer warning for a server with unreliable 404 status
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -165,6 +165,7 @@ extern void rollback_index_file(struct cache_file *); extern int trust_executable_bit; extern int assume_unchanged; extern int only_use_symrefs; +extern int warn_ambiguous_refs; extern int diff_rename_limit_default; extern int shared_repository; extern const char *apply_default_whitespace; |