summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-26 00:26:25 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-26 00:26:25 -0700
commit2545c089e329d340a9bdec9f725fa737063dd7f6 (patch)
tree04c86073e04ff56e3037e46aeef947c51d7d608a /cache.h
parent0b3035fe15bfd1d1f7cfab71819cb2cf4fc40d61 (diff)
parentb2655cdae953d619d488b69b7d49e4204e5682dc (diff)
downloadgit-2545c089e329d340a9bdec9f725fa737063dd7f6.tar.gz
Merge branch 'fg/push-default'
* fg/push-default: builtin-push.c: Fix typo: "anythig" -> "anything" Display warning for default git push with no push.default config New config push.default to decide default behavior for push Conflicts: Documentation/config.txt
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 39789ee94a..f48e80bc05 100644
--- a/cache.h
+++ b/cache.h
@@ -542,8 +542,17 @@ enum rebase_setup_type {
AUTOREBASE_ALWAYS,
};
+enum push_default_type {
+ PUSH_DEFAULT_UNSPECIFIED = -1,
+ PUSH_DEFAULT_NOTHING = 0,
+ PUSH_DEFAULT_MATCHING,
+ PUSH_DEFAULT_TRACKING,
+ PUSH_DEFAULT_CURRENT,
+};
+
extern enum branch_track git_branch_track;
extern enum rebase_setup_type autorebase;
+extern enum push_default_type push_default;
#define GIT_REPO_VERSION 0
extern int repository_format_version;