diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-03-26 00:26:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-26 00:26:25 -0700 |
| commit | 2545c089e329d340a9bdec9f725fa737063dd7f6 (patch) | |
| tree | 04c86073e04ff56e3037e46aeef947c51d7d608a /environment.c | |
| parent | Merge branch 'dm/maint-docco' (diff) | |
| parent | builtin-push.c: Fix typo: "anythig" -> "anything" (diff) | |
| download | tgif-2545c089e329d340a9bdec9f725fa737063dd7f6.tar.xz | |
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 'environment.c')
| -rw-r--r-- | environment.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c index e278bce0ea..4696885b22 100644 --- a/environment.c +++ b/environment.c @@ -42,6 +42,7 @@ enum safe_crlf safe_crlf = SAFE_CRLF_WARN; unsigned whitespace_rule_cfg = WS_DEFAULT_RULE; enum branch_track git_branch_track = BRANCH_TRACK_REMOTE; enum rebase_setup_type autorebase = AUTOREBASE_NEVER; +enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED; /* Parallel index stat data preload? */ int core_preload_index = 0; |